commit f5d136c231a8c0b601e236a63b7bb4d4c92ca526
author Tri Vo <trong@google.com> Wed Aug 02 15:19:22 2017 -0700
committer Steven Moreland <smoreland@google.com> Thu Aug 03 00:30:01 2017 +0000
tree da385476b0496a6df4d8498005424dea3dcc5885
parent 7dcc345b6428a33c9d4f954ba98be0fd37d0b5f7

Update Android.bp HIDL makefiles

Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104

health/1.0/Android.bp

diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp
index 4fb2d7b..3b5dde8 100644
--- a/health/1.0/Android.bp
+++ b/health/1.0/Android.bp
@@ -39,7 +39,7 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.hardware.health@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.hardware.health@1.0_genc++"],

health/1.0/default/Android.bp

diff --git a/health/1.0/default/Android.bp b/health/1.0/default/Android.bp
index c57152f..cb2e87d 100644
--- a/health/1.0/default/Android.bp
+++ b/health/1.0/default/Android.bp
@@ -1,7 +1,3 @@
-subdirs = [
-    "libhealthd",
-]
-
 cc_library_static {
     name: "android.hardware.health@1.0-convert",
     vendor_available: true,

health/Android.bp

diff --git a/health/Android.bp b/health/Android.bp
index ed19a37..a6f6017 100644
--- a/health/Android.bp
+++ b/health/Android.bp
@@ -2,5 +2,6 @@
 subdirs = [
     "1.0",
     "1.0/default",
+    "1.0/default/libhealthd",
     "1.0/vts/functional",
 ]