commit 4f25c2a14324c92ad38a45ea30bca30973e792f6
author Steven Moreland <smoreland@google.com> Fri Aug 11 22:59:15 2017 +0000
committer Steven Moreland <smoreland@google.com> Fri Aug 11 23:02:01 2017 +0000
tree d39bf8b2001b394ad7824ceb255c51c4f8be13a7
parent 1020ebedfbf7c5014896266a98de562a6116d4a2

Revert "Revert "Updating all makefiles.""

Relanding without automotive/vehicle/2.0+2.1 changes.

This reverts commit 1020ebedfbf7c5014896266a98de562a6116d4a2.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: Icc49df42c2bedf443d878d5d8fbaa53441ea65db

thermal/1.1/Android.bp

diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp
index 833f219..0985d94 100644
--- a/thermal/1.1/Android.bp
+++ b/thermal/1.1/Android.bp
@@ -42,13 +42,16 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.hardware.thermal@1.1",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.hardware.thermal@1.1_genc++"],
     generated_headers: ["android.hardware.thermal@1.1_genc++_headers"],
     export_generated_headers: ["android.hardware.thermal@1.1_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",