commit 320b5134b5808132133990ddf4fc54f2d094023a
author Steven Moreland <smoreland@google.com> Fri May 12 13:02:04 2017 -0700
committer Steven Moreland <smoreland@google.com> Fri May 12 13:09:49 2017 -0700
tree 7949f7d5accff33039688e04d791715ca3d9e99a
parent ebce2c382213fdd3777fe3c64640ab75aebbd8c5

Update makefiles.

Note cleanspec required because of b/38205169 (genrule
doesn't delete output files before building, so when
removing some, they get stale).

Test: power vts test compiles
Change-Id: Ie7ef0fc3d943a75fe898238cf861fb7f99f4146b
Fixes: 35813011

usb/1.1/Android.bp

diff --git a/usb/1.1/Android.bp b/usb/1.1/Android.bp
index 7342d00..d5cdf04 100644
--- a/usb/1.1/Android.bp
+++ b/usb/1.1/Android.bp
@@ -12,7 +12,7 @@
 genrule {
     name: "android.hardware.usb@1.1_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1",
     srcs: [
         ":android.hardware.usb@1.1_hal",
     ],
@@ -26,7 +26,7 @@
 genrule {
     name: "android.hardware.usb@1.1_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1",
     srcs: [
         ":android.hardware.usb@1.1_hal",
     ],