From 20dbbe370f339f661cfa37b61c46c0ccaaa0824f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 27 Mar 2020 15:01:15 -0700
Subject: [PATCH] Fix static dependency on libprotobuf-cpp-lite-ndk

Soong was adding shared dependency on libprotobuf-cpp-lite-ndk in
addition to the manual static dependency.  This resulted in ODR
issues when libc++.so was loaded through libprotobuf-cpp-lite.so.
Set proto.static: true to tell Soong to use the static dependency.

Test: atest sdkextensions_e2e_tests
Change-Id: I2c9f439b98d277e6b53edd2e309f48aade089c45
---
 apex/sdkextensions/derive_sdk/Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apex/sdkextensions/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp
index cf49902d9978d..6e21581f94ee5 100644
--- a/apex/sdkextensions/derive_sdk/Android.bp
+++ b/apex/sdkextensions/derive_sdk/Android.bp
@@ -20,13 +20,13 @@ cc_defaults {
     ],
     proto: {
         type: "lite",
+        static: true,
     },
     sdk_version: "current",
     stl: "c++_static",
     shared_libs: [ "liblog" ],
     static_libs: [
         "libbase_ndk",
-        "libprotobuf-cpp-lite-ndk",
     ],
 }