Revert "Update makefiles for Java package path."
This reverts commit ab0792ccdc52958b9bd524e7025d5e38ea0bb0d6.
Change-Id: I47fc272d9fa8875e3d7ccb10cb748c738fbf8135
diff --git a/audio/2.0/Android.mk b/audio/2.0/Android.mk
index f8767ec..31001c0 100644
--- a/audio/2.0/Android.mk
+++ b/audio/2.0/Android.mk
@@ -12,7 +12,7 @@
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
diff --git a/audio/common/2.0/Android.mk b/audio/common/2.0/Android.mk
index 423fe35..05530a8 100644
--- a/audio/common/2.0/Android.mk
+++ b/audio/common/2.0/Android.mk
@@ -12,7 +12,7 @@
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
diff --git a/audio/effect/2.0/Android.mk b/audio/effect/2.0/Android.mk
index 3383efd..0f4b5d4 100644
--- a/audio/effect/2.0/Android.mk
+++ b/audio/effect/2.0/Android.mk
@@ -12,7 +12,7 @@
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