Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "sdk_version_variant" into rvc-dev

Browse Source 
* changes:
  Make derive_sdk_prefer32 uninstallable
  Fix static dependency on libprotobuf-cpp-lite-ndk
This commit is contained in:
Colin Cross
2020-05-02 01:41:18 +00:00
committed by Android (Google) Code Review
parent 371634f4d0 4a1fd46b77
commit 765563bea2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/sdkextensions/derive_sdk/Android.bp
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",
], ],
} }
@@ -45,7 +45,8 @@ cc_binary {
compile_multilib: "prefer32", compile_multilib: "prefer32",
stem: "derive_sdk", stem: "derive_sdk",
apex_available: [ "test_com.android.sdkext" ], apex_available: [ "test_com.android.sdkext" ],
visibility: [ "//frameworks/base/apex/sdkextensions/testing" ] visibility: [ "//frameworks/base/apex/sdkextensions/testing" ],
installable: false,
} }
prebuilt_etc { prebuilt_etc {