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
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index 1b68720..d685da7 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hidl.base@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.base@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
srcs: [
"IBase.hal",
],
@@ -15,7 +15,7 @@
genrule {
name: "android.hidl.base@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.base@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
srcs: [
"IBase.hal",
],
diff --git a/transport/base/1.0/Android.mk b/transport/base/1.0/Android.mk
index 61b173b..8164c56 100644
--- a/transport/base/1.0/Android.mk
+++ b/transport/base/1.0/Android.mk
@@ -24,7 +24,6 @@
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava \
-randroid.hidl:system/libhidl/transport \
- -randroid.hidl:system/libhidl/transport \
android.hidl.base@1.0::IBase
$(GEN): $(LOCAL_PATH)/IBase.hal
@@ -55,7 +54,6 @@
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava \
-randroid.hidl:system/libhidl/transport \
- -randroid.hidl:system/libhidl/transport \
android.hidl.base@1.0::IBase
$(GEN): $(LOCAL_PATH)/IBase.hal
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",
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
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index ca8341d..b2454ea 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hidl.memory@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.memory@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
srcs: [
"IAllocator.hal",
"IMapper.hal",
@@ -19,7 +19,7 @@
genrule {
name: "android.hidl.memory@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.memory@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
srcs: [
"IAllocator.hal",
"IMapper.hal",
diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index 9113e41..62b5dbc 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -3,7 +3,7 @@
genrule {
name: "android.hidl.token@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.token@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
srcs: [
"ITokenManager.hal",
],
@@ -15,7 +15,7 @@
genrule {
name: "android.hidl.token@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.token@1.0",
+ cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
srcs: [
"ITokenManager.hal",
],
diff --git a/transport/token/1.0/Android.mk b/transport/token/1.0/Android.mk
index 3d07671..2e4a58d 100644
--- a/transport/token/1.0/Android.mk
+++ b/transport/token/1.0/Android.mk
@@ -28,7 +28,6 @@
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava \
-randroid.hidl:system/libhidl/transport \
- -randroid.hidl:system/libhidl/transport \
android.hidl.token@1.0::ITokenManager
$(GEN): $(LOCAL_PATH)/ITokenManager.hal
@@ -63,7 +62,6 @@
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava \
-randroid.hidl:system/libhidl/transport \
- -randroid.hidl:system/libhidl/transport \
android.hidl.token@1.0::ITokenManager
$(GEN): $(LOCAL_PATH)/ITokenManager.hal