summaryrefslogtreecommitdiff
path: root/transport/base
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-01-18 10:08:24 -0800
committerSteven Moreland <smoreland@google.com>2017-01-18 10:10:33 -0800
commitcaec4df3c05c28172e2d0f213233d302fc30d265 (patch)
treecff6e4ea3faa6e12710dedde6ba1e296322b114f /transport/base
parent1f6b31425030bf4d9527b833ac865e53b64172b5 (diff)
downloadlibhidl-caec4df3c05c28172e2d0f213233d302fc30d265.tar.gz
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
Diffstat (limited to 'transport/base')
-rw-r--r--transport/base/1.0/Android.bp4
-rw-r--r--transport/base/1.0/Android.mk2
2 files changed, 2 insertions, 4 deletions
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 {
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 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
$(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 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \
$(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