diff options
| author | 2020-05-02 01:41:18 +0000 | |
|---|---|---|
| committer | 2020-05-02 01:41:18 +0000 | |
| commit | 765563bea20942e3332e407ef3fba7f742aa45cb (patch) | |
| tree | 8addc3a66d21aa9cb0a68c4f916948e4ccc1dcad | |
| parent | 371634f4d015be64a5628a3e89eabdf4d568f71d (diff) | |
| parent | 4a1fd46b775fa30d842e472b34446f9d5389daa0 (diff) | |
Merge changes from topic "sdk_version_variant" into rvc-dev
* changes:
Make derive_sdk_prefer32 uninstallable
Fix static dependency on libprotobuf-cpp-lite-ndk
| -rw-r--r-- | apex/sdkextensions/derive_sdk/Android.bp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apex/sdkextensions/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp index cf49902d9978..c419b51c9b9b 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", ], } @@ -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 { |