summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh2017-11-28 13:31:03 -0600
committerandroid-build-merger2017-11-28 13:31:03 -0600
commit1bf3cfc11dc601d8450a77a7576fdff7ee1f4a54 (patch)
treed08921ac443036e2e91bc512c8d8fcd9228e438e
parentdbd7e5f031e159cafdb5f8e82d985cf236b6fa60 (diff)
parentf53fe9317baa06e7d1b898f2b106224d3e0202f5 (diff)
downloadplatform-hardware-interfaces-1bf3cfc11dc601d8450a77a7576fdff7ee1f4a54.tar.gz
platform-hardware-interfaces-1bf3cfc11dc601d8450a77a7576fdff7ee1f4a54.tar.xz
platform-hardware-interfaces-1bf3cfc11dc601d8450a77a7576fdff7ee1f4a54.zip
Merge "Use -Werror in hardware/interfaces" am: 02804915fb am: 8e736c21de
am: f53fe9317b Change-Id: Ifc0a5be285be1a57d998db3c032e392b307cfa80
-rw-r--r--bluetooth/1.0/default/Android.bp1
-rw-r--r--boot/1.0/default/Android.bp2
-rw-r--r--gatekeeper/1.0/default/Android.bp2
-rw-r--r--gnss/1.0/default/Android.bp4
-rw-r--r--soundtrigger/2.0/default/Android.mk2
-rw-r--r--thermal/1.0/default/Android.bp1
-rw-r--r--tv/cec/1.0/default/Android.bp2
-rw-r--r--tv/input/1.0/default/Android.bp2
8 files changed, 14 insertions, 2 deletions
diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp
index 63e75629..48bbadf8 100644
--- a/bluetooth/1.0/default/Android.bp
+++ b/bluetooth/1.0/default/Android.bp
@@ -115,6 +115,7 @@ cc_test_host {
115 115
116cc_binary { 116cc_binary {
117 name: "android.hardware.bluetooth@1.0-service", 117 name: "android.hardware.bluetooth@1.0-service",
118 defaults: ["hidl_defaults"],
118 relative_install_path: "hw", 119 relative_install_path: "hw",
119 vendor: true, 120 vendor: true,
120 init_rc: ["android.hardware.bluetooth@1.0-service.rc"], 121 init_rc: ["android.hardware.bluetooth@1.0-service.rc"],
diff --git a/boot/1.0/default/Android.bp b/boot/1.0/default/Android.bp
index c9b74925..6cfbf32e 100644
--- a/boot/1.0/default/Android.bp
+++ b/boot/1.0/default/Android.bp
@@ -1,5 +1,6 @@
1cc_library_shared { 1cc_library_shared {
2 name: "android.hardware.boot@1.0-impl", 2 name: "android.hardware.boot@1.0-impl",
3 defaults: ["hidl_defaults"],
3 relative_install_path: "hw", 4 relative_install_path: "hw",
4 vendor: true, 5 vendor: true,
5 srcs: ["BootControl.cpp"], 6 srcs: ["BootControl.cpp"],
@@ -17,6 +18,7 @@ cc_library_shared {
17 18
18cc_binary { 19cc_binary {
19 name: "android.hardware.boot@1.0-service", 20 name: "android.hardware.boot@1.0-service",
21 defaults: ["hidl_defaults"],
20 relative_install_path: "hw", 22 relative_install_path: "hw",
21 vendor: true, 23 vendor: true,
22 init_rc: ["android.hardware.boot@1.0-service.rc"], 24 init_rc: ["android.hardware.boot@1.0-service.rc"],
diff --git a/gatekeeper/1.0/default/Android.bp b/gatekeeper/1.0/default/Android.bp
index 4e6c9f04..ae3b91cd 100644
--- a/gatekeeper/1.0/default/Android.bp
+++ b/gatekeeper/1.0/default/Android.bp
@@ -1,5 +1,6 @@
1cc_library_shared { 1cc_library_shared {
2 name: "android.hardware.gatekeeper@1.0-impl", 2 name: "android.hardware.gatekeeper@1.0-impl",
3 defaults: ["hidl_defaults"],
3 relative_install_path: "hw", 4 relative_install_path: "hw",
4 vendor: true, 5 vendor: true,
5 6
@@ -18,6 +19,7 @@ cc_library_shared {
18 19
19cc_binary { 20cc_binary {
20 name: "android.hardware.gatekeeper@1.0-service", 21 name: "android.hardware.gatekeeper@1.0-service",
22 defaults: ["hidl_defaults"],
21 relative_install_path: "hw", 23 relative_install_path: "hw",
22 vendor: true, 24 vendor: true,
23 init_rc: ["android.hardware.gatekeeper@1.0-service.rc"], 25 init_rc: ["android.hardware.gatekeeper@1.0-service.rc"],
diff --git a/gnss/1.0/default/Android.bp b/gnss/1.0/default/Android.bp
index 007ed975..ca495e69 100644
--- a/gnss/1.0/default/Android.bp
+++ b/gnss/1.0/default/Android.bp
@@ -1,5 +1,6 @@
1cc_library_shared { 1cc_library_shared {
2 name: "android.hardware.gnss@1.0-impl", 2 name: "android.hardware.gnss@1.0-impl",
3 defaults: ["hidl_defaults"],
3 vendor: true, 4 vendor: true,
4 relative_install_path: "hw", 5 relative_install_path: "hw",
5 srcs: [ 6 srcs: [
@@ -27,14 +28,13 @@ cc_library_shared {
27 "libhardware", 28 "libhardware",
28 ], 29 ],
29 30
30 cflags: ["-Werror"],
31
32} 31}
33 32
34cc_binary { 33cc_binary {
35 relative_install_path: "hw", 34 relative_install_path: "hw",
36 vendor: true, 35 vendor: true,
37 name: "android.hardware.gnss@1.0-service", 36 name: "android.hardware.gnss@1.0-service",
37 defaults: ["hidl_defaults"],
38 init_rc: ["android.hardware.gnss@1.0-service.rc"], 38 init_rc: ["android.hardware.gnss@1.0-service.rc"],
39 srcs: ["service.cpp"], 39 srcs: ["service.cpp"],
40 40
diff --git a/soundtrigger/2.0/default/Android.mk b/soundtrigger/2.0/default/Android.mk
index 068c6b4b..92628586 100644
--- a/soundtrigger/2.0/default/Android.mk
+++ b/soundtrigger/2.0/default/Android.mk
@@ -23,6 +23,8 @@ LOCAL_MODULE_RELATIVE_PATH := hw
23LOCAL_SRC_FILES := \ 23LOCAL_SRC_FILES := \
24 SoundTriggerHalImpl.cpp 24 SoundTriggerHalImpl.cpp
25 25
26LOCAL_CFLAGS := -Wall -Werror
27
26LOCAL_SHARED_LIBRARIES := \ 28LOCAL_SHARED_LIBRARIES := \
27 libhidlbase \ 29 libhidlbase \
28 libhidltransport \ 30 libhidltransport \
diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp
index 2054b88f..9d81474b 100644
--- a/thermal/1.0/default/Android.bp
+++ b/thermal/1.0/default/Android.bp
@@ -34,6 +34,7 @@ cc_library_shared {
34 34
35cc_binary { 35cc_binary {
36 name: "android.hardware.thermal@1.0-service", 36 name: "android.hardware.thermal@1.0-service",
37 defaults: ["hidl_defaults"],
37 relative_install_path: "hw", 38 relative_install_path: "hw",
38 vendor: true, 39 vendor: true,
39 init_rc: ["android.hardware.thermal@1.0-service.rc"], 40 init_rc: ["android.hardware.thermal@1.0-service.rc"],
diff --git a/tv/cec/1.0/default/Android.bp b/tv/cec/1.0/default/Android.bp
index efb88ec5..069f3273 100644
--- a/tv/cec/1.0/default/Android.bp
+++ b/tv/cec/1.0/default/Android.bp
@@ -1,5 +1,6 @@
1cc_library_shared { 1cc_library_shared {
2 name: "android.hardware.tv.cec@1.0-impl", 2 name: "android.hardware.tv.cec@1.0-impl",
3 defaults: ["hidl_defaults"],
3 vendor: true, 4 vendor: true,
4 relative_install_path: "hw", 5 relative_install_path: "hw",
5 srcs: ["HdmiCec.cpp"], 6 srcs: ["HdmiCec.cpp"],
@@ -18,6 +19,7 @@ cc_library_shared {
18 19
19cc_binary { 20cc_binary {
20 name: "android.hardware.tv.cec@1.0-service", 21 name: "android.hardware.tv.cec@1.0-service",
22 defaults: ["hidl_defaults"],
21 relative_install_path: "hw", 23 relative_install_path: "hw",
22 vendor: true, 24 vendor: true,
23 init_rc: ["android.hardware.tv.cec@1.0-service.rc"], 25 init_rc: ["android.hardware.tv.cec@1.0-service.rc"],
diff --git a/tv/input/1.0/default/Android.bp b/tv/input/1.0/default/Android.bp
index f8956f18..7c140a5c 100644
--- a/tv/input/1.0/default/Android.bp
+++ b/tv/input/1.0/default/Android.bp
@@ -1,5 +1,6 @@
1cc_library_shared { 1cc_library_shared {
2 name: "android.hardware.tv.input@1.0-impl", 2 name: "android.hardware.tv.input@1.0-impl",
3 defaults: ["hidl_defaults"],
3 vendor: true, 4 vendor: true,
4 relative_install_path: "hw", 5 relative_install_path: "hw",
5 srcs: ["TvInput.cpp"], 6 srcs: ["TvInput.cpp"],
@@ -19,6 +20,7 @@ cc_library_shared {
19 20
20cc_binary { 21cc_binary {
21 name: "android.hardware.tv.input@1.0-service", 22 name: "android.hardware.tv.input@1.0-service",
23 defaults: ["hidl_defaults"],
22 relative_install_path: "hw", 24 relative_install_path: "hw",
23 vendor: true, 25 vendor: true,
24 init_rc: ["android.hardware.tv.input@1.0-service.rc"], 26 init_rc: ["android.hardware.tv.input@1.0-service.rc"],