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

Commit 0734fd23 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "update-makefiles.sh" am: dcec84e9 am: 1eed5f2d am: 238c76ee 

am: 67188b98

Change-Id: I781587bacb5fb165d54d42bf7c8a87db7ef322f1
parents 67708809 67188b98

tests/versioning/1.0/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",

    srcs: [

        "IFoo.hal",

        ":android.hardware.tests.versioning@1.0_hal",

    ],

    out: [

        "android/hardware/tests/versioning/1.0/FooAll.cpp",
@@ -24,7 +24,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",

    srcs: [

        "IFoo.hal",

        ":android.hardware.tests.versioning@1.0_hal",

    ],

    out: [

        "android/hardware/tests/versioning/1.0/IFoo.h",

tests/versioning/1.0/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.tests.versioning@1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(local-generated-sources-dir)

intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -43,7 +43,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.tests.versioning@1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(local-generated-sources-dir)

intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

tests/versioning/2.2/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",

    srcs: [

        "IBar.hal",

        "IFoo.hal",

        ":android.hardware.tests.versioning@2.2_hal",

    ],

    out: [

        "android/hardware/tests/versioning/2.2/BarAll.cpp",
@@ -27,8 +26,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",

    srcs: [

        "IBar.hal",

        "IFoo.hal",

        ":android.hardware.tests.versioning@2.2_hal",

    ],

    out: [

        "android/hardware/tests/versioning/2.2/IBar.h",

tests/versioning/2.2/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.tests.versioning@2.2-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(local-generated-sources-dir)

intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -62,7 +62,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.tests.versioning@2.2-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(local-generated-sources-dir)

intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

tests/versioning/2.3/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3",

    srcs: [

        "IBar.hal",

        "IFoo.hal",

        ":android.hardware.tests.versioning@2.3_hal",

    ],

    out: [

        "android/hardware/tests/versioning/2.3/BarAll.cpp",
@@ -27,8 +26,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3",

    srcs: [

        "IBar.hal",

        "IFoo.hal",

        ":android.hardware.tests.versioning@2.3_hal",

    ],

    out: [

        "android/hardware/tests/versioning/2.3/IBar.h",