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

Commit 21bf757c authored by Jiyong Park's avatar Jiyong Park Committed by Android (Google) Code Review
Browse files

Merge "Remove ndk_platform backend. Use the ndk backend." into sc-dev-plus-aosp

parents 6ee02a2c 8c88b342

cmds/idlcli/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ package { 
cc_defaults {

cc_defaults {

    name: "idlcli-defaults",

    name: "idlcli-defaults",

    shared_libs: [

    shared_libs: [

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

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

        "android.hardware.vibrator@1.0",

        "android.hardware.vibrator@1.0",

        "android.hardware.vibrator@1.1",

        "android.hardware.vibrator@1.1",

        "android.hardware.vibrator@1.2",

        "android.hardware.vibrator@1.2",

libs/binder/ndk/tests/Android.bp

+3 −3
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ cc_test { 
    srcs: ["libbinder_ndk_unit_test.cpp"],

    srcs: ["libbinder_ndk_unit_test.cpp"],

    static_libs: [

    static_libs: [

        "IBinderNdkUnitTest-cpp",

        "IBinderNdkUnitTest-cpp",

        "IBinderNdkUnitTest-ndk_platform",

        "IBinderNdkUnitTest-ndk",

    ],

    ],

    test_suites: [

    test_suites: [

        "general-tests",

        "general-tests",
@@ -88,8 +88,8 @@ cc_test { 
    ],

    ],

    static_libs: [

    static_libs: [

        "IBinderVendorDoubleLoadTest-cpp",

        "IBinderVendorDoubleLoadTest-cpp",

        "IBinderVendorDoubleLoadTest-ndk_platform",

        "IBinderVendorDoubleLoadTest-ndk",

        "libbinder_aidl_test_stub-ndk_platform",

        "libbinder_aidl_test_stub-ndk",

    ],

    ],

    // critical that libbinder/libbinder_ndk are shared for VTS

    // critical that libbinder/libbinder_ndk are shared for VTS

    shared_libs: [

    shared_libs: [

libs/binder/rust/tests/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ cc_test { 
        "libbinder_ndk",

        "libbinder_ndk",

    ],

    ],

    static_libs: [

    static_libs: [

        "IBinderRustNdkInteropTest-ndk_platform",

        "IBinderRustNdkInteropTest-ndk",

        "libbinder_ndk_rust_interop",

        "libbinder_ndk_rust_interop",

    ],

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

libs/binder/tests/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -160,7 +160,7 @@ cc_test { 
    ],

    ],

    static_libs: [

    static_libs: [

        "binderRpcTestIface-cpp",

        "binderRpcTestIface-cpp",

        "binderRpcTestIface-ndk_platform",

        "binderRpcTestIface-ndk",

    ],

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

    require_root: true,

    require_root: true,
@@ -296,7 +296,7 @@ cc_test { 
    ],

    ],

    static_libs: [

    static_libs: [

        "binderStabilityTestIface-cpp",

        "binderStabilityTestIface-cpp",

        "binderStabilityTestIface-ndk_platform",

        "binderStabilityTestIface-ndk",

    ],

    ],





    test_suites: ["device-tests", "vts"],

    test_suites: ["device-tests", "vts"],

libs/gralloc/types/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -52,14 +52,14 @@ cc_library { 
    ],

    ],





    shared_libs: [

    shared_libs: [

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

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

        "android.hardware.graphics.mapper@4.0",

        "android.hardware.graphics.mapper@4.0",

        "libhidlbase",

        "libhidlbase",

        "liblog",

        "liblog",

    ],

    ],





    export_shared_lib_headers: [

    export_shared_lib_headers: [

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

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

        "android.hardware.graphics.mapper@4.0",

        "android.hardware.graphics.mapper@4.0",

        "libhidlbase",

        "libhidlbase",

    ],

    ],