commit f35ee3b192f76583f7ccb170d7f1dab36cf9e06c
author Yifan Hong <elsk@google.com> Tue Dec 13 22:20:16 2016 +0000
committer Yifan Hong <elsk@google.com> Tue Dec 13 22:20:16 2016 +0000
tree 34a0606cd60de072e360256ff7bb6022b721c72f
parent a8789f27cb89496675483b83c76f271474085d62

Revert "Revert "Update makefiles for Java package path.""

This reverts commit a8789f27cb89496675483b83c76f271474085d62.

Change-Id: I69980b580a556188ba868bb096ae1590b01759f5

audio/2.0/Android.mk

diff --git a/audio/2.0/Android.mk b/audio/2.0/Android.mk
index 31001c0..f8767ec 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/2.0/Constants.java
+GEN := $(intermediates)/android/hardware/audio/V2_0/Constants.java
 $(GEN): $(HIDL)
 $(GEN): $(LOCAL_PATH)/types.hal
 $(GEN): $(LOCAL_PATH)/IDevice.hal

audio/common/2.0/Android.mk

diff --git a/audio/common/2.0/Android.mk b/audio/common/2.0/Android.mk
index 05530a8..423fe35 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/2.0/Constants.java
+GEN := $(intermediates)/android/hardware/audio/common/V2_0/Constants.java
 $(GEN): $(HIDL)
 $(GEN): $(LOCAL_PATH)/types.hal
 

audio/effect/2.0/Android.mk

diff --git a/audio/effect/2.0/Android.mk b/audio/effect/2.0/Android.mk
index 0f4b5d4..3383efd 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/2.0/Constants.java
+GEN := $(intermediates)/android/hardware/audio/effect/V2_0/Constants.java
 $(GEN): $(HIDL)
 $(GEN): $(LOCAL_PATH)/types.hal
 $(GEN): $(LOCAL_PATH)/IAcousticEchoCancelerEffect.hal