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

Change-Id: Ifc47dea0cb0a9ffcd74910e42cc2fc6a1ca66460
2020-04-07 04:57:37 +00:00
parent c35322e04a d7c84979ff
commit 52a0f7c4eb
1 changed files with 1 additions and 1 deletions
--- 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",
    ],
 }