commit abfc331d7638f23eaa74348485d01597797ca4c9
author Steven Moreland <smoreland@google.com> Wed May 10 02:58:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 10 02:58:02 2017 +0000
tree 9095787c372818dd6ed9767f74745e2cf23bab19
parent f28c4d8b11945c9d469068b09a7f58cb7855a846
parent 4c9cfc07ffb385d59be2a2ade38f82f7e0360986

Merge "Update makefiles for c++-sources and c++-headers." am: 0609259ec7 am: 4d32c392d0
am: 4c9cfc07ff

Change-Id: Id2566418174312787958027ac823766da75636c1

transport/allocator/1.0/Android.bp

diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index 5a2423e..e6aa698 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",
     ],

transport/base/1.0/Android.bp

diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index 69de736..8382824 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",
     ],

transport/manager/1.0/Android.bp

diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index 82e7bab..8bdbfa5 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",
     ],

transport/memory/1.0/Android.bp

diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index 589f865..01a80ed 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",
     ],

transport/token/1.0/Android.bp

diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index de94851..4f7e6f4 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",
     ],