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

Commit f53015c8 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge changes from topics "vintf-rebootescrow", "vintf-vibrator" 

* changes:
  vibrator: use package as name
  rebootescrow: use package as name
parents bd0827aa 07f26946

rebootescrow/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line 
aidl_interface {

    name: "vintf-rebootescrow",

    name: "android.hardware.rebootescrow",

    vendor_available: true,

    srcs: [

        "android/hardware/rebootescrow/IRebootEscrow.aidl",

rebootescrow/aidl/default/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ cc_library_static { 
    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "vintf-rebootescrow-ndk_platform",

        "android.hardware.rebootescrow-ndk_platform",

    ],

    export_include_dirs: ["include"],

    srcs: [
@@ -47,7 +47,7 @@ cc_binary { 
    shared_libs: [

        "libbase",

        "libbinder_ndk",

        "vintf-rebootescrow-ndk_platform",

        "android.hardware.rebootescrow-ndk_platform",

    ],

    static_libs: [

        "libhadamardutils",

rebootescrow/aidl/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ cc_test { 
        "libbinder",

    ],

    static_libs: [

        "vintf-rebootescrow-cpp",

        "android.hardware.rebootescrow-cpp",

    ],

    test_suites: [

        "vts-core",

tests/extension/vibrator/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line 
aidl_interface {

    // This is an example test interface showing how to add functionality

    // with setExtension/getExtension

    name: "test-vintf-vibrator-ext",

    name: "test-android.hardware.vibrator-ext",

    vendor_available: true,

    srcs: [

        // Using android.hardware as the package because this is in
@@ -18,7 +18,7 @@ aidl_interface { 
    // This happens to use types from a core interface, so we import it, but

    // this won't always be needed.

    imports: [

        "vintf-vibrator",

        "android.hardware.vibrator",

    ],



    backend: {

tests/extension/vibrator/aidl/client/Android.bp

+13 −15
Original line number Diff line number Diff line 


// This example client is written as a test, but it is executing from a system

// context. All this code would look the same if it was running in system

// server for example.



cc_test {

    name: "test-vintf-vibrator-ext-client",

    name: "test-android.hardware.vibrator-ext-client",

    srcs: [

        // system code has the option to use the unstable C++ libbinder API

        // or the NDK one. For maximum code portability, using the ndk client
@@ -15,12 +14,11 @@ cc_test { 
    shared_libs: [

        "libbinder",

        "libutils",

         "vintf-vibrator-cpp",

         "test-vintf-vibrator-ext-cpp",

        "android.hardware.vibrator-cpp",

        "test-android.hardware.vibrator-ext-cpp",



        "libbinder_ndk",

         "vintf-vibrator-ndk_platform",

         "test-vintf-vibrator-ext-ndk_platform",

        "android.hardware.vibrator-ndk_platform",

        "test-android.hardware.vibrator-ext-ndk_platform",

    ],

}