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 20dbbe370f)
This commit is contained in:
Colin Cross
2020-03-27 15:01:15 -07:00
parent cf2562437b
commit 76fc3d37e0

View File

@@ -20,13 +20,13 @@ cc_defaults {
], ],
proto: { proto: {
type: "lite", type: "lite",
static: true,
}, },
sdk_version: "current", sdk_version: "current",
stl: "c++_static", stl: "c++_static",
shared_libs: [ "liblog" ], shared_libs: [ "liblog" ],
static_libs: [ static_libs: [
"libbase_ndk", "libbase_ndk",
"libprotobuf-cpp-lite-ndk",
], ],
} }