commit caec4df3c05c28172e2d0f213233d302fc30d265
author Steven Moreland <smoreland@google.com> Wed Jan 18 10:08:24 2017 -0800
committer Steven Moreland <smoreland@google.com> Wed Jan 18 10:10:33 2017 -0800
tree cff6e4ea3faa6e12710dedde6ba1e296322b114f
parent 1f6b31425030bf4d9527b833ac865e53b64172b5

Update HIDL makefiles.

This was causing a failure because package paths were defined multiple
times because of an error in hidl-gen code when these makefiles were
originally generated (Fixed in
I9ef32b3867646690363fc9f85fe691ae74796d45).

Test: hidl_test
Bug: 34325813
Change-Id: Ie6500e53ba66dab0773830462f1c59932d801bef

transport/manager/1.0/Android.bp

diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index b8e1987..c0ebdab 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -3,7 +3,7 @@
 genrule {
     name: "android.hidl.manager@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
     srcs: [
         "IServiceManager.hal",
         "IServiceNotification.hal",
@@ -17,7 +17,7 @@
 genrule {
     name: "android.hidl.manager@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
     srcs: [
         "IServiceManager.hal",
         "IServiceNotification.hal",

transport/manager/1.0/Android.mk

diff --git a/transport/manager/1.0/Android.mk b/transport/manager/1.0/Android.mk
index f805075..27fc2a2 100644
--- a/transport/manager/1.0/Android.mk
+++ b/transport/manager/1.0/Android.mk
@@ -30,7 +30,6 @@
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -randroid.hidl:system/libhidl/transport \
         android.hidl.manager@1.0::IServiceManager
 
 $(GEN): $(LOCAL_PATH)/IServiceManager.hal
@@ -49,7 +48,6 @@
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -randroid.hidl:system/libhidl/transport \
         android.hidl.manager@1.0::IServiceNotification
 
 $(GEN): $(LOCAL_PATH)/IServiceNotification.hal
@@ -86,7 +84,6 @@
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -randroid.hidl:system/libhidl/transport \
         android.hidl.manager@1.0::IServiceManager
 
 $(GEN): $(LOCAL_PATH)/IServiceManager.hal
@@ -105,7 +102,6 @@
         $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
         -Ljava \
         -randroid.hidl:system/libhidl/transport \
-        -randroid.hidl:system/libhidl/transport \
         android.hidl.manager@1.0::IServiceNotification
 
 $(GEN): $(LOCAL_PATH)/IServiceNotification.hal