From 821b01c9fe2fc732ea0c79da9501564ea815cd54 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 15 Feb 2017 10:59:23 -0800 Subject: [PATCH] update-makefiles.sh There have been some changes to the way hidl-gen generates these and some CLs got out of sync with hidl-gen. Test: pass Change-Id: I33c573499d5dd37de447902fd93929b80a5df371 --- radio/1.0/Android.mk | 38 --------------------------------- tests/versioning/1.0/Android.bp | 4 ++-- tests/versioning/1.0/Android.mk | 4 ++-- tests/versioning/2.2/Android.bp | 6 ++---- tests/versioning/2.2/Android.mk | 4 ++-- tests/versioning/2.3/Android.bp | 6 ++---- tests/versioning/2.3/Android.mk | 4 ++-- 7 files changed, 12 insertions(+), 54 deletions(-) diff --git a/radio/1.0/Android.mk b/radio/1.0/Android.mk index 9e9588adc6..7f4c7d42ce 100644 --- a/radio/1.0/Android.mk +++ b/radio/1.0/Android.mk @@ -73,25 +73,6 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) -# -# Build types.hal (ApnTypes) -# -GEN := $(intermediates)/android/hardware/radio/V1_0/ApnTypes.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.0::types.ApnTypes - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - # # Build types.hal (AppState) # @@ -3107,25 +3088,6 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) -# -# Build types.hal (ApnTypes) -# -GEN := $(intermediates)/android/hardware/radio/V1_0/ApnTypes.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.0::types.ApnTypes - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - # # Build types.hal (AppState) # diff --git a/tests/versioning/1.0/Android.bp b/tests/versioning/1.0/Android.bp index fd331f20b2..fbabc1002d 100644 --- a/tests/versioning/1.0/Android.bp +++ b/tests/versioning/1.0/Android.bp @@ -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", diff --git a/tests/versioning/1.0/Android.mk b/tests/versioning/1.0/Android.mk index 753ad0cad0..ba183841c4 100644 --- a/tests/versioning/1.0/Android.mk +++ b/tests/versioning/1.0/Android.mk @@ -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) diff --git a/tests/versioning/2.2/Android.bp b/tests/versioning/2.2/Android.bp index 5e90105781..953b6df24c 100644 --- a/tests/versioning/2.2/Android.bp +++ b/tests/versioning/2.2/Android.bp @@ -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", diff --git a/tests/versioning/2.2/Android.mk b/tests/versioning/2.2/Android.mk index 63766521d8..e2a2ff7dc3 100644 --- a/tests/versioning/2.2/Android.mk +++ b/tests/versioning/2.2/Android.mk @@ -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) diff --git a/tests/versioning/2.3/Android.bp b/tests/versioning/2.3/Android.bp index 1489539054..e48ed949d1 100644 --- a/tests/versioning/2.3/Android.bp +++ b/tests/versioning/2.3/Android.bp @@ -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", diff --git a/tests/versioning/2.3/Android.mk b/tests/versioning/2.3/Android.mk index 5b05152dda..4b511606cf 100644 --- a/tests/versioning/2.3/Android.mk +++ b/tests/versioning/2.3/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.tests.versioning@2.3-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) @@ -63,7 +63,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.tests.versioning@2.3-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)