Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 765563be authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes from topic "sdk_version_variant" into rvc-dev 

* changes:
  Make derive_sdk_prefer32 uninstallable
  Fix static dependency on libprotobuf-cpp-lite-ndk
parents 371634f4 4a1fd46b

apex/sdkextensions/derive_sdk/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -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 {