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

Commit 0e7a3c09 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Revert^4 "remove libbinder_ndk_helper_headers"" into main am: a5744474 am: eb5f59f6 

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



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

libs/binder/ndk/Android.bp

+15 −15
Original line number Diff line number Diff line
@@ -230,12 +230,24 @@ cc_library_headers { 
    },

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

        "com.android.media",

        "com.android.media.swcodec",

    ],

    min_sdk_version: "29",

}



// TODO: if you try to export libbinder_headers_platform_shared from libbinder_ndk.ndk, it will

// not select the NDK variant of libbinder_headers_platform_shared and instead, it will error

// that the NDK can't depend on glibc C++.

cc_library_headers {

    name: "libbinder_headers_platform_shared_ndk",

    export_include_dirs: ["include_cpp"],

    sdk_version: "29",

    min_sdk_version: "29",

    visibility: [":__subpackages__"],

}



ndk_headers {

    name: "libbinder_ndk_headers",

    from: "include_ndk/android",
@@ -246,26 +258,14 @@ ndk_headers { 
    license: "NOTICE",

}



// 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,

}

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



ndk_library {

    name: "libbinder_ndk",

    symbol_file: "libbinder_ndk.map.txt",

    first_version: "29",

    export_header_libs: [

        "libbinder_ndk_headers",

        "libbinder_ndk_helper_headers",

        // used to be part of the NDK, platform things depend on it

        "libbinder_headers_platform_shared_ndk",

    ],

}