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

Commit d3dae29b authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Automerger Merge Worker
Browse files

Merge "Revert "remove libbinder_ndk_helper_headers"" into main am: 95caae2f am: d502c349 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3242564



Change-Id: I6ea6db262e0cfa8420b341612504fa10200efe91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd22fade d502c349

libs/binder/ndk/Android.bp

+14 −1
Original line number Diff line number Diff line
@@ -246,7 +246,19 @@ ndk_headers { 
    license: "NOTICE",

}



// include_cpp are packaged in development/build/sdk.atree with the AIDL compiler

// TODO(b/160624671): package with the aidl compiler

ndk_headers {

    name: "libbinder_ndk_helper_headers",

    from: "include_cpp/android",

    to: "android",

    srcs: [

        "include_cpp/android/*.h",

    ],

    license: "NOTICE",

    // These are intentionally not C. It's a mistake that they're in the NDK.

    // See the bug above.

    skip_verification: true,

}



ndk_library {

    name: "libbinder_ndk",
@@ -254,5 +266,6 @@ ndk_library { 
    first_version: "29",

    export_header_libs: [

        "libbinder_ndk_headers",

        "libbinder_ndk_helper_headers",

    ],

}