commit 79069b1961c06fca20c1ff6611af5de964823c55
author Tri Vo <trong@google.com> Tue Sep 05 18:42:17 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 05 18:42:17 2017 +0000
tree 506f54943d7ff95b0ecf50a300cc0d2a0fe326b7
parent 8d2d1d08a15fccf8deccdafefdcfad382f8ba018
parent a1b981b71018e34cf1441ec91c643e86ca65ad32

Merge changes I931dafbb,I845672b2 into oc-mr1-dev

* changes:
  Thermal 1.1 test statically links to hal def libs.
  Update thermal hal Android.bp.

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",

thermal/1.1/vts/functional/Android.bp

diff --git a/thermal/1.1/vts/functional/Android.bp b/thermal/1.1/vts/functional/Android.bp
index cea5bf8..f5f01fa 100644
--- a/thermal/1.1/vts/functional/Android.bp
+++ b/thermal/1.1/vts/functional/Android.bp
@@ -16,20 +16,11 @@
 
 cc_test {
     name: "VtsHalThermalV1_1TargetTest",
-    defaults: ["hidl_defaults"],
+    defaults: ["VtsHalTargetTestDefaults"],
     srcs: ["VtsHalThermalV1_1TargetTest.cpp"],
-    shared_libs: [
-        "liblog",
-        "libhidlbase",
-        "libhidltransport",
-        "libutils",
+    static_libs: [
         "android.hardware.thermal@1.0",
         "android.hardware.thermal@1.1",
     ],
-    static_libs: ["VtsHalHidlTargetTestBase"],
-    cflags: [
-        "-O0",
-        "-g",
-    ],
 }