diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index a5f2410..03e8a56 100644
--- a/transport/allocator/1.0/Android.bp
+++ b/transport/allocator/1.0/Android.bp
@@ -10,7 +10,7 @@
 genrule {
     name: "android.hidl.allocator@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
     srcs: [
         ":android.hidl.allocator@1.0_hal",
     ],
@@ -22,7 +22,7 @@
 genrule {
     name: "android.hidl.allocator@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
     srcs: [
         ":android.hidl.allocator@1.0_hal",
     ],
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index b02483f..a137f78 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -11,7 +11,7 @@
 genrule {
     name: "android.hidl.base@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
     srcs: [
         ":android.hidl.base@1.0_hal",
     ],
@@ -24,7 +24,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 android.hidl.base@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
     srcs: [
         ":android.hidl.base@1.0_hal",
     ],
diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index b1e4984..bb712e1 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -11,7 +11,7 @@
 genrule {
     name: "android.hidl.manager@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
     srcs: [
         ":android.hidl.manager@1.0_hal",
     ],
@@ -24,7 +24,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 android.hidl.manager@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
     srcs: [
         ":android.hidl.manager@1.0_hal",
     ],
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index 2275f79..615c083 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -11,7 +11,7 @@
 genrule {
     name: "android.hidl.memory@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
     srcs: [
         ":android.hidl.memory@1.0_hal",
     ],
@@ -24,7 +24,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 android.hidl.memory@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
     srcs: [
         ":android.hidl.memory@1.0_hal",
     ],
diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index 9fb77d1..2fccbb6 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -10,7 +10,7 @@
 genrule {
     name: "android.hidl.token@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
     srcs: [
         ":android.hidl.token@1.0_hal",
     ],
@@ -22,7 +22,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 android.hidl.token@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
     srcs: [
         ":android.hidl.token@1.0_hal",
     ],