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

Commit 48131c0a authored by Jiyong Park's avatar Jiyong Park Committed by Automerger Merge Worker
Browse files

Merge "Remove ndk_platform backend. Use the ndk backend." am: 2346a4c6 am: 4ef9aa49 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1778908

Change-Id: Ib35b7b0ddc0bebd0714d290b1ac2fab8d5a1893e
parents 11636eb5 4ef9aa49

authsecret/aidl/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ cc_binary { 
        "AuthSecret.cpp",

    ],

    shared_libs: [

        "android.hardware.authsecret-V1-ndk_platform",

        "android.hardware.authsecret-V1-ndk",

        "libbase",

        "libbinder_ndk",

    ],

authsecret/aidl/vts/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cc_test { 
        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: ["VtsHalAuthSecretTargetTest.cpp"],

    static_libs: ["android.hardware.authsecret-V1-ndk_platform"],

    static_libs: ["android.hardware.authsecret-V1-ndk"],

    shared_libs: ["libbinder_ndk"],

    test_suites: [

        "general-tests",

automotive/occupant_awareness/aidl/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,6 @@ cc_binary { 
        "libbase",

        "libbinder_ndk",

        "libutils",

        "android.hardware.automotive.occupant_awareness-V1-ndk_platform",

        "android.hardware.automotive.occupant_awareness-V1-ndk",

    ],

}

automotive/occupant_awareness/aidl/mock/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,6 @@ cc_binary { 
        "libbase",

        "libbinder_ndk",

        "libutils",

        "android.hardware.automotive.occupant_awareness-V1-ndk_platform",

        "android.hardware.automotive.occupant_awareness-V1-ndk",

    ],

}

common/support/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ cc_library_static { 
    srcs: ["NativeHandle.cpp"],

    export_include_dirs: ["include"],

    shared_libs: [

        "android.hardware.common-V2-ndk_platform",

        "android.hardware.common-V2-ndk",

        "libcutils",

    ],

    apex_available: [
@@ -31,7 +31,7 @@ cc_test { 
    defaults: ["libbinder_ndk_host_user"],

    srcs: ["test.cpp"],

    static_libs: [

        "android.hardware.common-V2-ndk_platform",

        "android.hardware.common-V2-ndk",

        "libaidlcommonsupport",

    ],

    shared_libs: [