commit a8789f27cb89496675483b83c76f271474085d62
author Yifan Hong <elsk@google.com> Tue Dec 13 22:18:34 2016 +0000
committer Yifan Hong <elsk@google.com> Tue Dec 13 22:18:34 2016 +0000
tree 525581449bb22069acacd881e331fbc4272b81db
parent ab0792ccdc52958b9bd524e7025d5e38ea0bb0d6

Revert "Update makefiles for Java package path."

This reverts commit ab0792ccdc52958b9bd524e7025d5e38ea0bb0d6.

Change-Id: I47fc272d9fa8875e3d7ccb10cb748c738fbf8135

graphics/common/1.0/Android.mk

diff --git a/graphics/common/1.0/Android.mk b/graphics/common/1.0/Android.mk
index 0fa6dcc..5049cb3 100644
--- a/graphics/common/1.0/Android.mk
+++ b/graphics/common/1.0/Android.mk
@@ -15,7 +15,7 @@
 #
 # Build types.hal (ColorMode)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/ColorMode.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/ColorMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -34,7 +34,7 @@
 #
 # Build types.hal (ColorTransform)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/ColorTransform.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/ColorTransform.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -53,7 +53,7 @@
 #
 # Build types.hal (Dataspace)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/Dataspace.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/Dataspace.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -72,7 +72,7 @@
 #
 # Build types.hal (Hdr)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/Hdr.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/Hdr.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -91,7 +91,7 @@
 #
 # Build types.hal (PixelFormat)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/PixelFormat.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/PixelFormat.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -110,7 +110,7 @@
 #
 # Build types.hal (Transform)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/Transform.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/Transform.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -141,7 +141,7 @@
 #
 # Build types.hal (ColorMode)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/ColorMode.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/ColorMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -160,7 +160,7 @@
 #
 # Build types.hal (ColorTransform)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/ColorTransform.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/ColorTransform.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -179,7 +179,7 @@
 #
 # Build types.hal (Dataspace)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/Dataspace.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/Dataspace.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -198,7 +198,7 @@
 #
 # Build types.hal (Hdr)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/Hdr.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/Hdr.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -217,7 +217,7 @@
 #
 # Build types.hal (PixelFormat)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/PixelFormat.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/PixelFormat.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -236,7 +236,7 @@
 #
 # Build types.hal (Transform)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/Transform.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/Transform.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -264,7 +264,7 @@
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 #
-GEN := $(intermediates)/android/hardware/graphics/common/V1_0/Constants.java
+GEN := $(intermediates)/android/hardware/graphics/common/1.0/Constants.java
 $(GEN): $(HIDL)
 $(GEN): $(LOCAL_PATH)/types.hal