summaryrefslogtreecommitdiffstats
path: root/light
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2016-12-13 22:20:16 +0000
committerYifan Hong <elsk@google.com>2016-12-13 22:20:16 +0000
commitf35ee3b192f76583f7ccb170d7f1dab36cf9e06c (patch)
tree34a0606cd60de072e360256ff7bb6022b721c72f /light
parenta8789f27cb89496675483b83c76f271474085d62 (diff)
downloadandroid_hardware_interfaces-f35ee3b192f76583f7ccb170d7f1dab36cf9e06c.tar.gz
android_hardware_interfaces-f35ee3b192f76583f7ccb170d7f1dab36cf9e06c.tar.bz2
android_hardware_interfaces-f35ee3b192f76583f7ccb170d7f1dab36cf9e06c.zip
Revert "Revert "Update makefiles for Java package path.""
This reverts commit a8789f27cb89496675483b83c76f271474085d62. Change-Id: I69980b580a556188ba868bb096ae1590b01759f5
Diffstat (limited to 'light')
-rw-r--r--light/2.0/Android.mk24
1 files changed, 12 insertions, 12 deletions
diff --git a/light/2.0/Android.mk b/light/2.0/Android.mk
index 633f6afa8..ef19bad72 100644
--- a/light/2.0/Android.mk
+++ b/light/2.0/Android.mk
@@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build types.hal (Brightness)
#
-GEN := $(intermediates)/android/hardware/light/2.0/Brightness.java
+GEN := $(intermediates)/android/hardware/light/V2_0/Brightness.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 (Flash)
#
-GEN := $(intermediates)/android/hardware/light/2.0/Flash.java
+GEN := $(intermediates)/android/hardware/light/V2_0/Flash.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (LightState)
#
-GEN := $(intermediates)/android/hardware/light/2.0/LightState.java
+GEN := $(intermediates)/android/hardware/light/V2_0/LightState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -76,7 +76,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (Status)
#
-GEN := $(intermediates)/android/hardware/light/2.0/Status.java
+GEN := $(intermediates)/android/hardware/light/V2_0/Status.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -95,7 +95,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (Type)
#
-GEN := $(intermediates)/android/hardware/light/2.0/Type.java
+GEN := $(intermediates)/android/hardware/light/V2_0/Type.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -114,7 +114,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ILight.hal
#
-GEN := $(intermediates)/android/hardware/light/2.0/ILight.java
+GEN := $(intermediates)/android/hardware/light/V2_0/ILight.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ILight.hal
@@ -151,7 +151,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build types.hal (Brightness)
#
-GEN := $(intermediates)/android/hardware/light/2.0/Brightness.java
+GEN := $(intermediates)/android/hardware/light/V2_0/Brightness.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -170,7 +170,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (Flash)
#
-GEN := $(intermediates)/android/hardware/light/2.0/Flash.java
+GEN := $(intermediates)/android/hardware/light/V2_0/Flash.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -189,7 +189,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (LightState)
#
-GEN := $(intermediates)/android/hardware/light/2.0/LightState.java
+GEN := $(intermediates)/android/hardware/light/V2_0/LightState.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -208,7 +208,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (Status)
#
-GEN := $(intermediates)/android/hardware/light/2.0/Status.java
+GEN := $(intermediates)/android/hardware/light/V2_0/Status.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -227,7 +227,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (Type)
#
-GEN := $(intermediates)/android/hardware/light/2.0/Type.java
+GEN := $(intermediates)/android/hardware/light/V2_0/Type.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -246,7 +246,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ILight.hal
#
-GEN := $(intermediates)/android/hardware/light/2.0/ILight.java
+GEN := $(intermediates)/android/hardware/light/V2_0/ILight.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ILight.hal