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

gatekeeper/1.0/Android.mk

diff --git a/gatekeeper/1.0/Android.mk b/gatekeeper/1.0/Android.mk
index 5d66b45..29ffb10 100644
--- a/gatekeeper/1.0/Android.mk
+++ b/gatekeeper/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build types.hal (GatekeeperResponse)
 #
-GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/GatekeeperResponse.java
+GEN := $(intermediates)/android/hardware/gatekeeper/1.0/GatekeeperResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@
 #
 # Build types.hal (GatekeeperStatusCode)
 #
-GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/GatekeeperStatusCode.java
+GEN := $(intermediates)/android/hardware/gatekeeper/1.0/GatekeeperStatusCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@
 #
 # Build IGatekeeper.hal
 #
-GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/IGatekeeper.java
+GEN := $(intermediates)/android/hardware/gatekeeper/1.0/IGatekeeper.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGatekeeper.hal
@@ -94,7 +94,7 @@
 #
 # Build types.hal (GatekeeperResponse)
 #
-GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/GatekeeperResponse.java
+GEN := $(intermediates)/android/hardware/gatekeeper/1.0/GatekeeperResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -113,7 +113,7 @@
 #
 # Build types.hal (GatekeeperStatusCode)
 #
-GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/GatekeeperStatusCode.java
+GEN := $(intermediates)/android/hardware/gatekeeper/1.0/GatekeeperStatusCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -132,7 +132,7 @@
 #
 # Build IGatekeeper.hal
 #
-GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/IGatekeeper.java
+GEN := $(intermediates)/android/hardware/gatekeeper/1.0/IGatekeeper.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGatekeeper.hal