commit e5091993a7c95b97cce2c218c6a1e922f094d6e3
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 12 21:25:04 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 12 21:25:04 2017 +0000
tree 2fce01222a9b43ae43bc31a8b7646f78732a41bd
parent 6170b8777ea7f5966c5722e615eb6f9bb42387a7
parent f6ae289bab271663ee68a9f6f3ae8dd7cd0cc11b

Merge "Update makefiles from anywhere."

transport/HidlBinderSupport.cpp

diff --git a/transport/HidlBinderSupport.cpp b/transport/HidlBinderSupport.cpp
index 7788e33..d293542 100644
--- a/transport/HidlBinderSupport.cpp
+++ b/transport/HidlBinderSupport.cpp
@@ -85,7 +85,6 @@
 
     return _hidl_err;
 }
-// static
 const size_t hidl_string::kOffsetOfBuffer = offsetof(hidl_string, mBuffer);
 static_assert(hidl_string::kOffsetOfBuffer == 0, "wrong offset");
 

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",
     ],