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

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

Merge "libbinder_ndk: split C ABI from C++ API" am: bbe3d226 am: 29815b55...

Merge "libbinder_ndk: split C ABI from C++ API" am: bbe3d226 am: 29815b55 am: a64b3351 am: c7671960

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

Change-Id: Ic0216aeec4ab0a592d9622f0b476555f1446532b
parents f00d2348 c7671960
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ cc_library {
    host_supported: true,

    export_include_dirs: [
        "include_cpp",
        "include_ndk",
        "include_platform",
    ],
@@ -101,6 +102,17 @@ 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",
}

ndk_library {
    name: "libbinder_ndk",
    symbol_file: "libbinder_ndk.map.txt",
@@ -111,6 +123,7 @@ llndk_library {
    name: "libbinder_ndk",
    symbol_file: "libbinder_ndk.map.txt",
    export_include_dirs: [
        "include_cpp",
        "include_ndk",
        "include_platform",
    ],