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

Merge "Revert "Fix static dependency on libprotobuf-cpp-lite-ndk"" am: 32c3f23f37

Browse Source 
Change-Id: I5bee0e942b60081edfb82e24f7cfc61a2fd16f1b
This commit is contained in:
Colin Cross
2020-04-07 04:39:25 +00:00
committed by Automerger Merge Worker
parent f61540d482 32c3f23f37
commit d7c84979ff
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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",
], ],
} }