diff --git a/bluetooth/1.0/Android.mk b/bluetooth/1.0/Android.mk index d824d5d7ab..f8cd96e367 100644 --- a/bluetooth/1.0/Android.mk +++ b/bluetooth/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.bluetooth@1.0-java +LOCAL_MODULE := android.hardware.bluetooth-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -84,7 +84,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.bluetooth@1.0-java-static +LOCAL_MODULE := android.hardware.bluetooth-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -92,7 +92,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/boot/1.0/Android.mk b/boot/1.0/Android.mk index b188acbcea..efd5759c4c 100644 --- a/boot/1.0/Android.mk +++ b/boot/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.boot@1.0-java +LOCAL_MODULE := android.hardware.boot-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -80,7 +80,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.boot@1.0-java-static +LOCAL_MODULE := android.hardware.boot-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -88,7 +88,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/configstore/1.0/Android.mk b/configstore/1.0/Android.mk index 010d5093b1..6be99dbbf7 100644 --- a/configstore/1.0/Android.mk +++ b/configstore/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.configstore@1.0-java +LOCAL_MODULE := android.hardware.configstore-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -156,7 +156,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.configstore@1.0-java-static +LOCAL_MODULE := android.hardware.configstore-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -164,7 +164,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk index d43286c3a6..bdb3b295f5 100644 --- a/ir/1.0/Android.mk +++ b/ir/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.ir@1.0-java +LOCAL_MODULE := android.hardware.ir-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -61,7 +61,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.ir@1.0-java-static +LOCAL_MODULE := android.hardware.ir-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -69,7 +69,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk index 6f097641c6..3ea770733c 100644 --- a/nfc/1.0/Android.mk +++ b/nfc/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.nfc@1.0-java +LOCAL_MODULE := android.hardware.nfc-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -103,7 +103,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.nfc@1.0-java-static +LOCAL_MODULE := android.hardware.nfc-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -111,7 +111,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # @@ -201,7 +201,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.nfc@1.0-java-constants +LOCAL_MODULE := android.hardware.nfc-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/radio/1.0/Android.mk b/radio/1.0/Android.mk index 94072fbd6c..a71e672096 100644 --- a/radio/1.0/Android.mk +++ b/radio/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.radio@1.0-java +LOCAL_MODULE := android.hardware.radio-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -1840,6 +1840,25 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) +# +# Build types.hal (P2Constant) +# +GEN := $(intermediates)/android/hardware/radio/V1_0/P2Constant.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.P2Constant + +$(GEN): $(LOCAL_PATH)/types.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + # # Build types.hal (PcoDataInfo) # @@ -3039,7 +3058,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.radio@1.0-java-static +LOCAL_MODULE := android.hardware.radio-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -3047,7 +3066,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # @@ -4874,6 +4893,25 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) +# +# Build types.hal (P2Constant) +# +GEN := $(intermediates)/android/hardware/radio/V1_0/P2Constant.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.P2Constant + +$(GEN): $(LOCAL_PATH)/types.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + # # Build types.hal (PcoDataInfo) # diff --git a/radio/deprecated/1.0/Android.mk b/radio/deprecated/1.0/Android.mk index 4cce633863..11377d82f2 100644 --- a/radio/deprecated/1.0/Android.mk +++ b/radio/deprecated/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.radio.deprecated@1.0-java +LOCAL_MODULE := android.hardware.radio.deprecated-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,8 +13,8 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hardware.radio@1.0-java \ - android.hidl.base@1.0-java \ + android.hardware.radio-V1.0-java \ + android.hidl.base-V1.0-java \ # @@ -83,7 +83,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.radio.deprecated@1.0-java-static +LOCAL_MODULE := android.hardware.radio.deprecated-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -91,8 +91,8 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hardware.radio@1.0-java-static \ - android.hidl.base@1.0-java-static \ + android.hardware.radio-V1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/renderscript/1.0/Android.mk b/renderscript/1.0/Android.mk index 5c3a37db0f..cdd580a3db 100644 --- a/renderscript/1.0/Android.mk +++ b/renderscript/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.renderscript@1.0-java-constants +LOCAL_MODULE := android.hardware.renderscript-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk index 9d4d6b682c..29874dadfa 100644 --- a/tests/baz/1.0/Android.mk +++ b/tests/baz/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.baz@1.0-java +LOCAL_MODULE := android.hardware.tests.baz-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -101,7 +101,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.baz@1.0-java-static +LOCAL_MODULE := android.hardware.tests.baz-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -109,7 +109,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk index 6bc9390664..1a32ef5f04 100644 --- a/tests/expression/1.0/Android.mk +++ b/tests/expression/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.expression@1.0-java +LOCAL_MODULE := android.hardware.tests.expression-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -61,7 +61,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.expression@1.0-java-static +LOCAL_MODULE := android.hardware.tests.expression-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -69,7 +69,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/tests/hash/1.0/Android.mk b/tests/hash/1.0/Android.mk index 15428b427d..586df6e88e 100644 --- a/tests/hash/1.0/Android.mk +++ b/tests/hash/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.hash@1.0-java +LOCAL_MODULE := android.hardware.tests.hash-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -40,7 +40,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.hash@1.0-java-static +LOCAL_MODULE := android.hardware.tests.hash-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -48,7 +48,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/tests/inheritance/1.0/Android.mk b/tests/inheritance/1.0/Android.mk index 21aac00740..0ff9abc057 100644 --- a/tests/inheritance/1.0/Android.mk +++ b/tests/inheritance/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.inheritance@1.0-java +LOCAL_MODULE := android.hardware.tests.inheritance-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -107,7 +107,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.inheritance@1.0-java-static +LOCAL_MODULE := android.hardware.tests.inheritance-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -115,7 +115,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk index 2ee26d665c..4a5f7798ef 100644 --- a/tests/libhwbinder/1.0/Android.mk +++ b/tests/libhwbinder/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.libhwbinder@1.0-java +LOCAL_MODULE := android.hardware.tests.libhwbinder-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -40,7 +40,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.libhwbinder@1.0-java-static +LOCAL_MODULE := android.hardware.tests.libhwbinder-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -48,7 +48,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/tests/versioning/1.0/Android.mk b/tests/versioning/1.0/Android.mk index ba183841c4..81ffd082b9 100644 --- a/tests/versioning/1.0/Android.mk +++ b/tests/versioning/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning@1.0-java +LOCAL_MODULE := android.hardware.tests.versioning-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -40,7 +40,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning@1.0-java-static +LOCAL_MODULE := android.hardware.tests.versioning-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -48,7 +48,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/tests/versioning/2.2/Android.mk b/tests/versioning/2.2/Android.mk index e2a2ff7dc3..4fccce68c7 100644 --- a/tests/versioning/2.2/Android.mk +++ b/tests/versioning/2.2/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning@2.2-java +LOCAL_MODULE := android.hardware.tests.versioning-V2.2-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -59,7 +59,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning@2.2-java-static +LOCAL_MODULE := android.hardware.tests.versioning-V2.2-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -67,7 +67,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/tests/versioning/2.3/Android.mk b/tests/versioning/2.3/Android.mk index 68e6be46b9..36326d66e0 100644 --- a/tests/versioning/2.3/Android.mk +++ b/tests/versioning/2.3/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning@2.3-java +LOCAL_MODULE := android.hardware.tests.versioning-V2.3-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,9 +13,9 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hardware.tests.versioning@1.0-java \ - android.hardware.tests.versioning@2.2-java \ - android.hidl.base@1.0-java \ + android.hardware.tests.versioning-V1.0-java \ + android.hardware.tests.versioning-V2.2-java \ + android.hidl.base-V1.0-java \ # @@ -80,7 +80,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning@2.3-java-static +LOCAL_MODULE := android.hardware.tests.versioning-V2.3-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -88,9 +88,9 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hardware.tests.versioning@1.0-java-static \ - android.hardware.tests.versioning@2.2-java-static \ - android.hidl.base@1.0-java-static \ + android.hardware.tests.versioning-V1.0-java-static \ + android.hardware.tests.versioning-V2.2-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/tests/versioning/2.4/Android.mk b/tests/versioning/2.4/Android.mk index e41397feea..c716172ad8 100644 --- a/tests/versioning/2.4/Android.mk +++ b/tests/versioning/2.4/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning@2.4-java +LOCAL_MODULE := android.hardware.tests.versioning-V2.4-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,9 +13,9 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hardware.tests.versioning@2.2-java \ - android.hardware.tests.versioning@2.3-java \ - android.hidl.base@1.0-java \ + android.hardware.tests.versioning-V2.2-java \ + android.hardware.tests.versioning-V2.3-java \ + android.hidl.base-V1.0-java \ # @@ -42,7 +42,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning@2.4-java-static +LOCAL_MODULE := android.hardware.tests.versioning-V2.4-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -50,9 +50,9 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hardware.tests.versioning@2.2-java-static \ - android.hardware.tests.versioning@2.3-java-static \ - android.hidl.base@1.0-java-static \ + android.hardware.tests.versioning-V2.2-java-static \ + android.hardware.tests.versioning-V2.3-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/wifi/1.0/Android.mk b/wifi/1.0/Android.mk index 82409de5a2..08cdcfa62d 100644 --- a/wifi/1.0/Android.mk +++ b/wifi/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.wifi@1.0-java +LOCAL_MODULE := android.hardware.wifi-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -1884,7 +1884,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.wifi@1.0-java-static +LOCAL_MODULE := android.hardware.wifi-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -1892,7 +1892,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/wifi/supplicant/1.0/Android.mk b/wifi/supplicant/1.0/Android.mk index dd210d0333..18c783347a 100644 --- a/wifi/supplicant/1.0/Android.mk +++ b/wifi/supplicant/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.wifi.supplicant@1.0-java +LOCAL_MODULE := android.hardware.wifi.supplicant-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java \ + android.hidl.base-V1.0-java \ # @@ -384,7 +384,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.wifi.supplicant@1.0-java-static +LOCAL_MODULE := android.hardware.wifi.supplicant-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -392,7 +392,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base@1.0-java-static \ + android.hidl.base-V1.0-java-static \ #