summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2016-12-13 22:18:34 +0000
committerYifan Hong <elsk@google.com>2016-12-13 22:18:34 +0000
commita8789f27cb89496675483b83c76f271474085d62 (patch)
tree525581449bb22069acacd881e331fbc4272b81db /graphics
parentab0792ccdc52958b9bd524e7025d5e38ea0bb0d6 (diff)
downloadplatform_hardware_interfaces-a8789f27cb89496675483b83c76f271474085d62.tar.gz
platform_hardware_interfaces-a8789f27cb89496675483b83c76f271474085d62.tar.bz2
platform_hardware_interfaces-a8789f27cb89496675483b83c76f271474085d62.zip
Revert "Update makefiles for Java package path."
This reverts commit ab0792ccdc52958b9bd524e7025d5e38ea0bb0d6. Change-Id: I47fc272d9fa8875e3d7ccb10cb748c738fbf8135
Diffstat (limited to 'graphics')
-rw-r--r--graphics/common/1.0/Android.mk26
1 files changed, 13 insertions, 13 deletions
diff --git a/graphics/common/1.0/Android.mk b/graphics/common/1.0/Android.mk
index 0fa6dcc428..5049cb32a4 100644
--- a/graphics/common/1.0/Android.mk
+++ b/graphics/common/1.0/Android.mk
@@ -15,7 +15,7 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# 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 @@ intermediates := $(local-generated-sources-dir)
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