commit 6a3cdff31410d7809ac3ff9af3f687af4ded345e
author Steven Moreland <smoreland@google.com> Thu May 18 16:14:38 2017 -0700
committer Steven Moreland <smoreland@google.com> Fri May 19 15:40:27 2017 +0000
tree d63dae8110b08b3ff6279441aec8589ff6b0aef9
parent 19f11b53241877c442d31d9dc6b372e294a500d0

Add 'hidl-module-defaults'

This default library is added to all hals and allows us to
specify special behavior without having to update all hals
everywhere.

Test: boot internal marlin
Bug: 38415912
Change-Id: Iaf71375fabe642d9f28d2790c8a9e7934ca419dc

Android.bp

diff --git a/Android.bp b/Android.bp
index 500c313..dfd62d7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,6 +25,15 @@
     "-Werror",
 ]
 
+cc_defaults {
+    name: "hidl-module-defaults",
+    product_variables: {
+        treble: {
+            cflags: ["-D__ANDROID_TREBLE__"]
+        }
+    }
+}
+
 //
 // libhidl-gen-hash
 //

main.cpp

diff --git a/main.cpp b/main.cpp
index 1137a3f..69da62d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -817,6 +817,7 @@
         out << "cc_library_shared {\n";
         out.indent();
         out << "name: \"" << libraryName << "\",\n"
+            << "defaults: [\"hidl-module-defaults\"],\n"
             << "generated_sources: [\"" << genSourceName << "\"],\n"
             << "generated_headers: [\"" << genHeaderName << "\"],\n"
             << "export_generated_headers: [\"" << genHeaderName << "\"],\n";

test/vendor/1.0/Android.bp

diff --git a/test/vendor/1.0/Android.bp b/test/vendor/1.0/Android.bp
index de370fe..ada44f7 100644
--- a/test/vendor/1.0/Android.bp
+++ b/test/vendor/1.0/Android.bp
@@ -11,7 +11,7 @@
 genrule {
     name: "tests.vendor@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport -rtests:system/tools/hidl/test/ tests.vendor@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport -rtests:system/tools/hidl/test/ tests.vendor@1.0",
     srcs: [
         ":tests.vendor@1.0_hal",
     ],
@@ -24,7 +24,7 @@
 genrule {
     name: "tests.vendor@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport -rtests:system/tools/hidl/test/ tests.vendor@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport -rtests:system/tools/hidl/test/ tests.vendor@1.0",
     srcs: [
         ":tests.vendor@1.0_hal",
     ],
@@ -41,6 +41,7 @@
 
 cc_library_shared {
     name: "tests.vendor@1.0",
+    defaults: ["hidl-module-defaults"],
     generated_sources: ["tests.vendor@1.0_genc++"],
     generated_headers: ["tests.vendor@1.0_genc++_headers"],
     export_generated_headers: ["tests.vendor@1.0_genc++_headers"],