diff options
| author | 2020-03-27 15:01:15 -0700 | |
|---|---|---|
| committer | 2020-04-30 22:39:06 +0000 | |
| commit | 76fc3d37e0c8f5e8778809de90eb8c30bb4360d6 (patch) | |
| tree | 12142f03188f1cc588e9bf143c18be79e6ecf75a | |
| parent | cf2562437b7f1fbbf455b7b71541a2c5a31f32b8 (diff) | |
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)
| -rw-r--r-- | apex/sdkextensions/derive_sdk/Android.bp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/sdkextensions/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp index cf49902d9978..6e21581f94ee 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", ], } |