Update makefiles for c++-sources and c++-headers.

Test: pass
Bug: 38174080
Change-Id: I6104184ef1c3bac528de23ed5532c205799b2b0d

diff --git a/wifi/keystore/1.0/Android.bp b/wifi/keystore/1.0/Android.bp
index 89db75d..6d2e4f8 100644 (file)
--- a/wifi/keystore/1.0/Android.bp
+++ b/wifi/keystore/1.0/Android.bp
@@ -10,7 +10,7 @@ filegroup {
 genrule {
     name: "android.system.wifi.keystore@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0",
     srcs: [
         ":android.system.wifi.keystore@1.0_hal",
     ],
@@ -22,7 +22,7 @@ genrule {
 genrule {
     name: "android.system.wifi.keystore@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0",
     srcs: [
         ":android.system.wifi.keystore@1.0_hal",
     ],