From 76fc3d37e0c8f5e8778809de90eb8c30bb4360d6 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 27 Mar 2020 15:01:15 -0700
Subject: [PATCH 1/2] 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.

Bug: 149591340
Test: atest sdkextensions_e2e_tests
Change-Id: I2c9f439b98d277e6b53edd2e309f48aade089c45
Merged-In: I2c9f439b98d277e6b53edd2e309f48aade089c45
(cherry picked from commit 20dbbe370f339f661cfa37b61c46c0ccaaa0824f)
---
 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",
     ],
 }
 

From 4a1fd46b775fa30d842e472b34446f9d5389daa0 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 8 Apr 2020 15:57:57 -0700
Subject: [PATCH 2/2] Make derive_sdk_prefer32 uninstallable

Fix TARGET_BUILD_APPS builds by marking derive_sdk_prefer32
uninstallable so it doesn't try to create a rule to install to
the same path as derive_sdk.

Fixes: 153602595
Test: m TARGET_BUILD_APPS=foo nothing
Test: m test_com.android.sdkext &&
      deapexer list out/target/product/vsoc_x86/obj/ETC/test_com.android.sdkext_intermediates/test_com.android.sdkext.apex
Change-Id: I02bcbc0cbfef6ef66a79ad2ccd73c8af101b67de
Merged-In: I02bcbc0cbfef6ef66a79ad2ccd73c8af101b67de
(cherry picked from commit 198edb4c97eee0de32d7b5826c18fcb04dbf5798)
---
 apex/sdkextensions/derive_sdk/Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apex/sdkextensions/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp
index 6e21581f94ee5..c419b51c9b9b9 100644
--- a/apex/sdkextensions/derive_sdk/Android.bp
+++ b/apex/sdkextensions/derive_sdk/Android.bp
@@ -45,7 +45,8 @@ cc_binary {
     compile_multilib: "prefer32",
     stem: "derive_sdk",
     apex_available: [ "test_com.android.sdkext" ],
-    visibility: [ "//frameworks/base/apex/sdkextensions/testing" ]
+    visibility: [ "//frameworks/base/apex/sdkextensions/testing" ],
+    installable: false,
 }
 
 prebuilt_etc {