diff --git a/audio/2.0/Android.mk b/audio/2.0/Android.mk index e989364033..d5e840f8c9 100644 --- a/audio/2.0/Android.mk +++ b/audio/2.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.audio@2.0-java-constants +LOCAL_MODULE := android.hardware.audio-V2.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/audio/common/2.0/Android.mk b/audio/common/2.0/Android.mk index 7d62779de5..a78a395d99 100644 --- a/audio/common/2.0/Android.mk +++ b/audio/common/2.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.audio.common@2.0-java-constants +LOCAL_MODULE := android.hardware.audio.common-V2.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/audio/effect/2.0/Android.mk b/audio/effect/2.0/Android.mk index d71255e250..a426763b2a 100644 --- a/audio/effect/2.0/Android.mk +++ b/audio/effect/2.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.audio.effect@2.0-java-constants +LOCAL_MODULE := android.hardware.audio.effect-V2.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/automotive/vehicle/2.0/Android.mk b/automotive/vehicle/2.0/Android.mk index d093017f6c..eb05f35eca 100644 --- a/automotive/vehicle/2.0/Android.mk +++ b/automotive/vehicle/2.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.automotive.vehicle@2.0-java +LOCAL_MODULE := android.hardware.automotive.vehicle-V2.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 \ # @@ -977,7 +977,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.automotive.vehicle@2.0-java-static +LOCAL_MODULE := android.hardware.automotive.vehicle-V2.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -985,7 +985,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/automotive/vehicle/2.1/Android.mk b/automotive/vehicle/2.1/Android.mk index f030af085e..693fe2d07f 100644 --- a/automotive/vehicle/2.1/Android.mk +++ b/automotive/vehicle/2.1/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.automotive.vehicle@2.1-java +LOCAL_MODULE := android.hardware.automotive.vehicle-V2.1-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.automotive.vehicle@2.0-java \ - android.hidl.base@1.0-java \ + android.hardware.automotive.vehicle-V2.0-java \ + android.hidl.base-V1.0-java \ # @@ -269,7 +269,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.automotive.vehicle@2.1-java-static +LOCAL_MODULE := android.hardware.automotive.vehicle-V2.1-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -277,8 +277,8 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hardware.automotive.vehicle@2.0-java-static \ - android.hidl.base@1.0-java-static \ + android.hardware.automotive.vehicle-V2.0-java-static \ + android.hidl.base-V1.0-java-static \ # diff --git a/biometrics/fingerprint/2.1/Android.mk b/biometrics/fingerprint/2.1/Android.mk index 567b38a1bb..2f3237162c 100644 --- a/biometrics/fingerprint/2.1/Android.mk +++ b/biometrics/fingerprint/2.1/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-java +LOCAL_MODULE := android.hardware.biometrics.fingerprint-V2.1-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 \ # @@ -236,7 +236,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-java-static +LOCAL_MODULE := android.hardware.biometrics.fingerprint-V2.1-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -244,7 +244,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/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/camera/common/1.0/Android.mk b/camera/common/1.0/Android.mk index 9e05172bfd..47bfb31b1b 100644 --- a/camera/common/1.0/Android.mk +++ b/camera/common/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.camera.common@1.0-java +LOCAL_MODULE := android.hardware.camera.common-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -188,7 +188,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.camera.common@1.0-java-static +LOCAL_MODULE := android.hardware.camera.common-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/camera/metadata/3.2/Android.mk b/camera/metadata/3.2/Android.mk index 86cee910ad..935c37cd1e 100644 --- a/camera/metadata/3.2/Android.mk +++ b/camera/metadata/3.2/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.camera.metadata@3.2-java +LOCAL_MODULE := android.hardware.camera.metadata-V3.2-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -1233,7 +1233,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.camera.metadata@3.2-java-static +LOCAL_MODULE := android.hardware.camera.metadata-V3.2-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) 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/contexthub/1.0/Android.mk b/contexthub/1.0/Android.mk index a053986833..d161e3b092 100644 --- a/contexthub/1.0/Android.mk +++ b/contexthub/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.contexthub@1.0-java +LOCAL_MODULE := android.hardware.contexthub-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 \ # @@ -331,7 +331,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.contexthub@1.0-java-static +LOCAL_MODULE := android.hardware.contexthub-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -339,7 +339,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/gatekeeper/1.0/Android.mk b/gatekeeper/1.0/Android.mk index 70206ff035..576f729a23 100644 --- a/gatekeeper/1.0/Android.mk +++ b/gatekeeper/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.gatekeeper@1.0-java +LOCAL_MODULE := android.hardware.gatekeeper-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.gatekeeper@1.0-java-static +LOCAL_MODULE := android.hardware.gatekeeper-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/gnss/1.0/Android.mk b/gnss/1.0/Android.mk index 5985c87516..bb1b765d8c 100644 --- a/gnss/1.0/Android.mk +++ b/gnss/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.gnss@1.0-java +LOCAL_MODULE := android.hardware.gnss-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 \ # @@ -527,7 +527,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.gnss@1.0-java-static +LOCAL_MODULE := android.hardware.gnss-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -535,7 +535,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 \ # @@ -1049,7 +1049,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.gnss@1.0-java-constants +LOCAL_MODULE := android.hardware.gnss-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/graphics/common/1.0/Android.mk b/graphics/common/1.0/Android.mk index ae80c6afd9..569a5f444a 100644 --- a/graphics/common/1.0/Android.mk +++ b/graphics/common/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.graphics.common@1.0-java +LOCAL_MODULE := android.hardware.graphics.common-V1.0-java LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -150,7 +150,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.graphics.common@1.0-java-static +LOCAL_MODULE := android.hardware.graphics.common-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -295,7 +295,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.graphics.common@1.0-java-constants +LOCAL_MODULE := android.hardware.graphics.common-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/health/1.0/Android.mk b/health/1.0/Android.mk index ebb89a7dbd..b03b868691 100644 --- a/health/1.0/Android.mk +++ b/health/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.health@1.0-java +LOCAL_MODULE := android.hardware.health-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 \ # @@ -137,7 +137,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.health@1.0-java-static +LOCAL_MODULE := android.hardware.health-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -145,7 +145,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 \ # @@ -269,7 +269,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.health@1.0-java-constants +LOCAL_MODULE := android.hardware.health-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) 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/light/2.0/Android.mk b/light/2.0/Android.mk index 7bb429366f..24d7ab1394 100644 --- a/light/2.0/Android.mk +++ b/light/2.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.light@2.0-java +LOCAL_MODULE := android.hardware.light-V2.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 \ # @@ -137,7 +137,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.light@2.0-java-static +LOCAL_MODULE := android.hardware.light-V2.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -145,7 +145,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/media/Android.bp b/media/Android.bp index 34ecf17e17..2c12fb8ca9 100755 --- a/media/Android.bp +++ b/media/Android.bp @@ -2,7 +2,7 @@ subdirs = [ "1.0", "omx/1.0", - "omx/1.0/vts/functional/master", - "omx/1.0/vts/functional/component", - "omx/1.0/vts/functional/audio", + "omx/1.0/vts/functional/audio", + "omx/1.0/vts/functional/component", + "omx/1.0/vts/functional/master", ] diff --git a/memtrack/1.0/Android.mk b/memtrack/1.0/Android.mk index 62bee97cc0..8583b0ab6a 100644 --- a/memtrack/1.0/Android.mk +++ b/memtrack/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.memtrack@1.0-java +LOCAL_MODULE := android.hardware.memtrack-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 \ # @@ -118,7 +118,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.memtrack@1.0-java-static +LOCAL_MODULE := android.hardware.memtrack-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -126,7 +126,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/power/1.0/Android.mk b/power/1.0/Android.mk index 98d95a8595..8a89a45269 100644 --- a/power/1.0/Android.mk +++ b/power/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.power@1.0-java +LOCAL_MODULE := android.hardware.power-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 \ # @@ -137,7 +137,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.power@1.0-java-static +LOCAL_MODULE := android.hardware.power-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -145,7 +145,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/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/sensors/1.0/Android.mk b/sensors/1.0/Android.mk index 29f7c7e061..18528a91d4 100644 --- a/sensors/1.0/Android.mk +++ b/sensors/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.sensors@1.0-java-constants +LOCAL_MODULE := android.hardware.sensors-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/extension/light/2.0/Android.mk b/tests/extension/light/2.0/Android.mk index 16424a337c..f1e10e47ee 100644 --- a/tests/extension/light/2.0/Android.mk +++ b/tests/extension/light/2.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.extension.light@2.0-java +LOCAL_MODULE := android.hardware.tests.extension.light-V2.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.light@2.0-java \ - android.hidl.base@1.0-java \ + android.hardware.light-V2.0-java \ + android.hidl.base-V1.0-java \ # @@ -100,7 +100,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.extension.light@2.0-java-static +LOCAL_MODULE := android.hardware.tests.extension.light-V2.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -108,8 +108,8 @@ intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hardware.light@2.0-java-static \ - android.hidl.base@1.0-java-static \ + android.hardware.light-V2.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/thermal/1.0/Android.mk b/thermal/1.0/Android.mk index 7748b9e207..5a0a9a0a86 100644 --- a/thermal/1.0/Android.mk +++ b/thermal/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.thermal@1.0-java +LOCAL_MODULE := android.hardware.thermal-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 \ # @@ -175,7 +175,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.thermal@1.0-java-static +LOCAL_MODULE := android.hardware.thermal-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -183,7 +183,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 \ # @@ -345,7 +345,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.thermal@1.0-java-constants +LOCAL_MODULE := android.hardware.thermal-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/tv/cec/1.0/Android.mk b/tv/cec/1.0/Android.mk index b08099e240..1e3853d08e 100644 --- a/tv/cec/1.0/Android.mk +++ b/tv/cec/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tv.cec@1.0-java +LOCAL_MODULE := android.hardware.tv.cec-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 \ # @@ -293,7 +293,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tv.cec@1.0-java-static +LOCAL_MODULE := android.hardware.tv.cec-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -301,7 +301,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/tv/input/1.0/Android.mk b/tv/input/1.0/Android.mk index 87654da1e1..aa1cf70de9 100644 --- a/tv/input/1.0/Android.mk +++ b/tv/input/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tv.input@1.0-java-constants +LOCAL_MODULE := android.hardware.tv.input-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/usb/1.0/Android.mk b/usb/1.0/Android.mk index 7be71471fc..62f69354bc 100644 --- a/usb/1.0/Android.mk +++ b/usb/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.usb@1.0-java +LOCAL_MODULE := android.hardware.usb-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 \ # @@ -198,7 +198,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.usb@1.0-java-static +LOCAL_MODULE := android.hardware.usb-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -206,7 +206,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 \ # @@ -391,7 +391,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.usb@1.0-java-constants +LOCAL_MODULE := android.hardware.usb-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/vibrator/1.0/Android.mk b/vibrator/1.0/Android.mk index 8de1ac31fb..c54b655a39 100644 --- a/vibrator/1.0/Android.mk +++ b/vibrator/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.vibrator@1.0-java +LOCAL_MODULE := android.hardware.vibrator-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 \ # @@ -99,7 +99,7 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.vibrator@1.0-java-static +LOCAL_MODULE := android.hardware.vibrator-V1.0-java-static LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) @@ -107,7 +107,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 \ # @@ -193,7 +193,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.vibrator@1.0-java-constants +LOCAL_MODULE := android.hardware.vibrator-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES intermediates := $(call local-generated-sources-dir, COMMON) diff --git a/vr/1.0/Android.mk b/vr/1.0/Android.mk index 0fbdaf77b2..fc5c675d12 100644 --- a/vr/1.0/Android.mk +++ b/vr/1.0/Android.mk @@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.vr@1.0-java +LOCAL_MODULE := android.hardware.vr-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.vr@1.0-java-static +LOCAL_MODULE := android.hardware.vr-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/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 \ #