From 0077bd317fa938b271dfde22b78e1e5c49b4bdf2 Mon Sep 17 00:00:00 2001
From: Jack He <siyuanh@google.com>
Date: Thu, 26 May 2022 14:15:02 -0700
Subject: Cert: Fix test infra to meet latest environment requirement

* Restrict protobuf Python package to below 4.0 so that AOSP aprotoc
  generated code still works
* Static link NDK libraries so that it works in mainline compilation
  environment

Bug: 232258524
Test: gd/cert/run
Tag: #bug-fix
Ignore-AOSP-First: cherry-pick
Merged-In: I6d4a14ce90d4d1db06d78cf6ab8de4bc08275c58
Change-Id: I6d4a14ce90d4d1db06d78cf6ab8de4bc08275c58
---
 system/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/setup.py')

diff --git a/system/setup.py b/system/setup.py
index cdb76f8a3a..597b9df2ed 100644
--- a/system/setup.py
+++ b/system/setup.py
@@ -29,7 +29,7 @@ force_install = False
 install_requires = [
     'grpcio',
     'psutil',
-    'protobuf>=3.14.0',
+    'protobuf>=3.14.0, <4.0',
     'mobly',
 ]
 
-- 
cgit v1.2.3