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

Commit 1519b41b 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."

parents b7cd668c c426c6db

automotive/audiocontrol/aidl/default/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ cc_binary { 
    vendor: true,

    shared_libs: [

        "android.hardware.audio.common@7.0-enums",

        "android.frameworks.automotive.powerpolicy-V1-ndk_platform",

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

        "android.frameworks.automotive.powerpolicy-V1-ndk",

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

        "libbase",

        "libbinder_ndk",

        "libcutils",

automotive/vehicle/2.0/default/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ cc_defaults { 
    defaults: ["vhal_v2_0_defaults"],

    shared_libs: [

        "libbinder_ndk",

        "android.automotive.watchdog-V2-ndk_platform",

        "android.automotive.watchdog-V2-ndk",

    ],

}
@@ -177,11 +177,11 @@ cc_test { 
    // Exclude share libraries from default because they might be missing on

    // some test platforms and we are using static libraries instead.

    exclude_shared_libs: [

        "android.automotive.watchdog-V2-ndk_platform",

        "android.automotive.watchdog-V2-ndk",

        "android.hardware.automotive.vehicle@2.0",

    ],

    static_libs: [

        "android.automotive.watchdog-V2-ndk_platform",

        "android.automotive.watchdog-V2-ndk",

        "android.hardware.automotive.vehicle@2.0",

    ],

    header_libs: ["libbase_headers"],
@@ -206,11 +206,11 @@ cc_test { 
    // Exclude share libraries from default because they might be missing on

    // some test platforms and we are using static libraries instead.

    exclude_shared_libs: [

        "android.automotive.watchdog-V2-ndk_platform",

        "android.automotive.watchdog-V2-ndk",

        "android.hardware.automotive.vehicle@2.0",

    ],

    whole_static_libs: [

        "android.automotive.watchdog-V2-ndk_platform",

        "android.automotive.watchdog-V2-ndk",

        "android.hardware.automotive.vehicle@2.0",

        "android.hardware.automotive.vehicle@2.0-default-impl-lib",

        "android.hardware.automotive.vehicle@2.0-libproto-native",

biometrics/face/aidl/default/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ cc_binary { 
    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "android.hardware.biometrics.face-V1-ndk_platform",

        "android.hardware.biometrics.common-V1-ndk_platform",

        "android.hardware.biometrics.face-V1-ndk",

        "android.hardware.biometrics.common-V1-ndk",

    ],

    srcs: [

        "main.cpp",

biometrics/face/aidl/vts/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ cc_test { 
    ],

    srcs: ["VtsHalBiometricsFaceTargetTest.cpp"],

    static_libs: [

        "android.hardware.biometrics.common-V1-ndk_platform",

        "android.hardware.biometrics.face-V1-ndk_platform",

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

        "android.hardware.keymaster-V3-ndk_platform",

        "android.hardware.biometrics.common-V1-ndk",

        "android.hardware.biometrics.face-V1-ndk",

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

        "android.hardware.keymaster-V3-ndk",

    ],

    shared_libs: [

        "libbinder_ndk",

biometrics/fingerprint/aidl/default/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ cc_binary { 
    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "android.hardware.biometrics.fingerprint-V1-ndk_platform",

        "android.hardware.biometrics.common-V1-ndk_platform",

        "android.hardware.biometrics.fingerprint-V1-ndk",

        "android.hardware.biometrics.common-V1-ndk",

    ],

}