Merge "Revert "Update makefiles for Java package path."" (b998a6c4) · Commits · e / os / android_hardware_interfaces

audio/2.0/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ intermediates := $(local-generated-sources-dir)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
		#
		GEN := $(intermediates)/android/hardware/audio/V2_0/Constants.java
		GEN := $(intermediates)/android/hardware/audio/2.0/Constants.java
		$(GEN): $(HIDL)
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/IDevice.hal

audio/common/2.0/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ intermediates := $(local-generated-sources-dir)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
		#
		GEN := $(intermediates)/android/hardware/audio/common/V2_0/Constants.java
		GEN := $(intermediates)/android/hardware/audio/common/2.0/Constants.java
		$(GEN): $(HIDL)
		$(GEN): $(LOCAL_PATH)/types.hal

audio/effect/2.0/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ intermediates := $(local-generated-sources-dir)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
		#
		GEN := $(intermediates)/android/hardware/audio/effect/V2_0/Constants.java
		GEN := $(intermediates)/android/hardware/audio/effect/2.0/Constants.java
		$(GEN): $(HIDL)
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/IAcousticEchoCancelerEffect.hal

bluetooth/1.0/Android.mk

+6 −6

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
		#
		# Build types.hal (Status)
		#
		GEN := $(intermediates)/android/hardware/bluetooth/V1_0/Status.java
		GEN := $(intermediates)/android/hardware/bluetooth/1.0/Status.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		@@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
		#
		# Build IBluetoothHci.hal
		#
		GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHci.java
		GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHci.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHci.hal
		@@ -61,7 +61,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
		#
		# Build IBluetoothHciCallbacks.hal
		#
		GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java
		GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHciCallbacks.hal
		@@ -98,7 +98,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		#
		# Build types.hal (Status)
		#
		GEN := $(intermediates)/android/hardware/bluetooth/V1_0/Status.java
		GEN := $(intermediates)/android/hardware/bluetooth/1.0/Status.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		@@ -117,7 +117,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
		#
		# Build IBluetoothHci.hal
		#
		GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHci.java
		GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHci.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHci.hal
		@@ -140,7 +140,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
		#
		# Build IBluetoothHciCallbacks.hal
		#
		GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java
		GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHciCallbacks.hal

boot/1.0/Android.mk

+6 −6

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
		#
		# Build types.hal (BoolResult)
		#
		GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java
		GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		@@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
		#
		# Build types.hal (CommandResult)
		#
		GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java
		GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		@@ -57,7 +57,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
		#
		# Build IBootControl.hal
		#
		GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java
		GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal
		@@ -94,7 +94,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		#
		# Build types.hal (BoolResult)
		#
		GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java
		GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		@@ -113,7 +113,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
		#
		# Build types.hal (CommandResult)
		#
		GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java
		GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		@@ -132,7 +132,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
		#
		# Build IBootControl.hal
		#
		GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java
		GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal