commit 10bfcad7f78de3c1c61ed088d2c8c91785b0cb83
author Steven Moreland <smoreland@google.com> Wed May 10 20:02:38 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 10 20:02:39 2017 +0000
tree f119ce389b2ed0e8c5f99faa6ce7bd4b564ea066
parent 7814f8fc474412fdf200b2eb87a507f1236a0f32
parent f4203d2cb93ad1070ab48e76c3f4277c8056a290

Merge "Update makefiles for c++-sources and c++-headers." into oc-dev

schedulerservice/1.0/Android.bp

diff --git a/schedulerservice/1.0/Android.bp b/schedulerservice/1.0/Android.bp
index 9763d7d..c47821c 100644
--- a/schedulerservice/1.0/Android.bp
+++ b/schedulerservice/1.0/Android.bp
@@ -10,7 +10,7 @@
 genrule {
     name: "android.frameworks.schedulerservice@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
     srcs: [
         ":android.frameworks.schedulerservice@1.0_hal",
     ],
@@ -22,7 +22,7 @@
 genrule {
     name: "android.frameworks.schedulerservice@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
     srcs: [
         ":android.frameworks.schedulerservice@1.0_hal",
     ],

sensorservice/1.0/Android.bp

diff --git a/sensorservice/1.0/Android.bp b/sensorservice/1.0/Android.bp
index 8c82b69..5391071 100644
--- a/sensorservice/1.0/Android.bp
+++ b/sensorservice/1.0/Android.bp
@@ -14,7 +14,7 @@
 genrule {
     name: "android.frameworks.sensorservice@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
     srcs: [
         ":android.frameworks.sensorservice@1.0_hal",
     ],
@@ -30,7 +30,7 @@
 genrule {
     name: "android.frameworks.sensorservice@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
     srcs: [
         ":android.frameworks.sensorservice@1.0_hal",
     ],

vr/composer/1.0/Android.bp

diff --git a/vr/composer/1.0/Android.bp b/vr/composer/1.0/Android.bp
index 8b23776..ea19437 100644
--- a/vr/composer/1.0/Android.bp
+++ b/vr/composer/1.0/Android.bp
@@ -10,7 +10,7 @@
 genrule {
     name: "android.frameworks.vr.composer@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
     srcs: [
         ":android.frameworks.vr.composer@1.0_hal",
     ],
@@ -22,7 +22,7 @@
 genrule {
     name: "android.frameworks.vr.composer@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
     srcs: [
         ":android.frameworks.vr.composer@1.0_hal",
     ],