commit 8f2e579b05110ffff979b8422efab4080f2e6b6e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 01 01:30:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 01 01:30:42 2017 +0000
tree 21357bdea51f598c02309cdba7c1f4c1baa49bc9
parent 98ca32ffe7f708d56c78fb70f34432587a773ef7
parent 1a52e8237d6f5ea95d7b11c227f41310d8e4dcaf

Merge "Emit tags for interfaces."

Android.bp

diff --git a/Android.bp b/Android.bp
index d0c31e9..ef388fc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,7 +45,7 @@
 //
 // libhidl-gen-hash
 //
-cc_library_shared {
+cc_library {
     name: "libhidl-gen-hash",
     host_supported: true,
     cflags: hidl_flags,

main.cpp

diff --git a/main.cpp b/main.cpp
index 6645267..8c78609 100644
--- a/main.cpp
+++ b/main.cpp
@@ -729,7 +729,7 @@
         const std::set<FQName> &importedPackagesHierarchy) {
 
     // C++ library definition
-    out << "cc_library_shared {\n";
+    out << "cc_library {\n";
     out.indent();
     out << "name: \"" << libraryName << (generateVendor ? "_vendor" : "") << "\",\n"
         << "defaults: [\"hidl-module-defaults\"],\n"

test/impl_test/Android.bp

diff --git a/test/impl_test/Android.bp b/test/impl_test/Android.bp
index b220f24..8ea7db8 100644
--- a/test/impl_test/Android.bp
+++ b/test/impl_test/Android.bp
@@ -42,4 +42,5 @@
         "libutils",
         "android.hardware.tests.foo@1.0",
     ],
+    cflags: ["-Wno-unused-parameter"],
 }

test/vendor/1.0/Android.bp

diff --git a/test/vendor/1.0/Android.bp b/test/vendor/1.0/Android.bp
index d76a955..f640216 100644
--- a/test/vendor/1.0/Android.bp
+++ b/test/vendor/1.0/Android.bp
@@ -39,7 +39,7 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "tests.vendor@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["tests.vendor@1.0_genc++"],
@@ -64,7 +64,7 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "tests.vendor@1.0_vendor",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["tests.vendor@1.0_genc++"],

test/vendor/1.1/Android.bp

diff --git a/test/vendor/1.1/Android.bp b/test/vendor/1.1/Android.bp
index a062087..6d41300 100644
--- a/test/vendor/1.1/Android.bp
+++ b/test/vendor/1.1/Android.bp
@@ -35,7 +35,7 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "tests.vendor@1.1",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["tests.vendor@1.1_genc++"],
@@ -62,7 +62,7 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "tests.vendor@1.1_vendor",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["tests.vendor@1.1_genc++"],

utils/Android.bp

diff --git a/utils/Android.bp b/utils/Android.bp
index 58fa517..ff171d3 100644
--- a/utils/Android.bp
+++ b/utils/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library_shared {
+cc_library {
     name: "libhidl-gen-utils",
     host_supported: true,
     vendor_available: true,