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

Commit 3361cf4f authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ic33682d986ad14f8f0911da198c27fd903ea5ce3
parents 03c59e22 d7c84979

apex/sdkextensions/derive_sdk/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -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",

    ],

    ],

}

}