summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-11-02 16:16:29 -0500
committerSteven Moreland2017-11-03 11:30:28 -0500
commit90e3a50f03102f24e035f8da1ab03946b8a991c1 (patch)
tree4e5eb28969f8862bd9a74bedc6f5d0fe5314505f
parent9d4c21f9afb122c64255d0d4bdfa935d2b0bc834 (diff)
downloadplatform-hardware-interfaces-90e3a50f03102f24e035f8da1ab03946b8a991c1.tar.gz
platform-hardware-interfaces-90e3a50f03102f24e035f8da1ab03946b8a991c1.tar.xz
platform-hardware-interfaces-90e3a50f03102f24e035f8da1ab03946b8a991c1.zip
Automatic mk -> bp.
Automatic mk -> bp conversion for all modules here which can be converted and built automatically. Test: Soong resolves all dependencies Bug: 37512442 Change-Id: Ib789212cb88d55731397c600d132e7c672c0d8be
-rw-r--r--audio/Android.bp1
-rw-r--r--audio/effect/2.0/default/Android.bp46
-rw-r--r--audio/effect/2.0/default/Android.mk46
-rw-r--r--biometrics/Android.bp1
-rw-r--r--biometrics/fingerprint/2.1/default/Android.bp21
-rw-r--r--biometrics/fingerprint/2.1/default/Android.mk21
-rw-r--r--bluetooth/1.0/default/Android.bp20
-rw-r--r--bluetooth/1.0/default/Android.mk39
-rw-r--r--boot/1.0/default/Android.bp34
-rw-r--r--boot/1.0/default/Android.mk36
-rw-r--r--boot/Android.bp1
-rw-r--r--gatekeeper/1.0/default/Android.bp36
-rw-r--r--gatekeeper/1.0/default/Android.mk40
-rw-r--r--gatekeeper/Android.bp1
-rw-r--r--gnss/1.0/default/Android.bp54
-rw-r--r--gnss/1.0/default/Android.mk56
-rw-r--r--gnss/Android.bp1
-rw-r--r--sensors/1.0/default/Android.bp17
-rw-r--r--sensors/1.0/default/Android.mk23
-rw-r--r--thermal/1.0/default/Android.bp37
-rw-r--r--thermal/1.0/default/Android.mk39
-rw-r--r--tv/Android.bp2
-rw-r--r--tv/cec/1.0/default/Android.bp39
-rw-r--r--tv/cec/1.0/default/Android.mk44
-rw-r--r--tv/input/1.0/default/Android.bp41
-rw-r--r--tv/input/1.0/default/Android.mk46
26 files changed, 351 insertions, 391 deletions
diff --git a/audio/Android.bp b/audio/Android.bp
index 8046672a..f4a5846f 100644
--- a/audio/Android.bp
+++ b/audio/Android.bp
@@ -6,5 +6,6 @@ subdirs = [
6 "common/2.0/default", 6 "common/2.0/default",
7 "common/test/utility", 7 "common/test/utility",
8 "effect/2.0", 8 "effect/2.0",
9 "effect/2.0/default",
9 "effect/2.0/vts/functional", 10 "effect/2.0/vts/functional",
10] 11]
diff --git a/audio/effect/2.0/default/Android.bp b/audio/effect/2.0/default/Android.bp
new file mode 100644
index 00000000..79bb8b0d
--- /dev/null
+++ b/audio/effect/2.0/default/Android.bp
@@ -0,0 +1,46 @@
1cc_library_shared {
2 name: "android.hardware.audio.effect@2.0-impl",
3 vendor: true,
4 relative_install_path: "hw",
5 srcs: [
6 "AcousticEchoCancelerEffect.cpp",
7 "AudioBufferManager.cpp",
8 "AutomaticGainControlEffect.cpp",
9 "BassBoostEffect.cpp",
10 "Conversions.cpp",
11 "DownmixEffect.cpp",
12 "Effect.cpp",
13 "EffectsFactory.cpp",
14 "EnvironmentalReverbEffect.cpp",
15 "EqualizerEffect.cpp",
16 "LoudnessEnhancerEffect.cpp",
17 "NoiseSuppressionEffect.cpp",
18 "PresetReverbEffect.cpp",
19 "VirtualizerEffect.cpp",
20 "VisualizerEffect.cpp",
21 ],
22
23 shared_libs: [
24 "libbase",
25 "libcutils",
26 "libeffects",
27 "libfmq",
28 "libhidlbase",
29 "libhidlmemory",
30 "libhidltransport",
31 "liblog",
32 "libutils",
33 "android.hardware.audio.common@2.0",
34 "android.hardware.audio.common@2.0-util",
35 "android.hardware.audio.effect@2.0",
36 "android.hidl.memory@1.0",
37 ],
38
39 header_libs: [
40 "libaudio_system_headers",
41 "libaudioclient_headers",
42 "libeffects_headers",
43 "libhardware_headers",
44 "libmedia_headers",
45 ],
46}
diff --git a/audio/effect/2.0/default/Android.mk b/audio/effect/2.0/default/Android.mk
deleted file mode 100644
index f89d4f7b..00000000
--- a/audio/effect/2.0/default/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE := android.hardware.audio.effect@2.0-impl
5LOCAL_PROPRIETARY_MODULE := true
6LOCAL_MODULE_RELATIVE_PATH := hw
7LOCAL_SRC_FILES := \
8 AcousticEchoCancelerEffect.cpp \
9 AudioBufferManager.cpp \
10 AutomaticGainControlEffect.cpp \
11 BassBoostEffect.cpp \
12 Conversions.cpp \
13 DownmixEffect.cpp \
14 Effect.cpp \
15 EffectsFactory.cpp \
16 EnvironmentalReverbEffect.cpp \
17 EqualizerEffect.cpp \
18 LoudnessEnhancerEffect.cpp \
19 NoiseSuppressionEffect.cpp \
20 PresetReverbEffect.cpp \
21 VirtualizerEffect.cpp \
22 VisualizerEffect.cpp \
23
24LOCAL_SHARED_LIBRARIES := \
25 libbase \
26 libcutils \
27 libeffects \
28 libfmq \
29 libhidlbase \
30 libhidlmemory \
31 libhidltransport \
32 liblog \
33 libutils \
34 android.hardware.audio.common@2.0 \
35 android.hardware.audio.common@2.0-util \
36 android.hardware.audio.effect@2.0 \
37 android.hidl.memory@1.0 \
38
39LOCAL_HEADER_LIBRARIES := \
40 libaudio_system_headers \
41 libaudioclient_headers \
42 libeffects_headers \
43 libhardware_headers \
44 libmedia_headers \
45
46include $(BUILD_SHARED_LIBRARY)
diff --git a/biometrics/Android.bp b/biometrics/Android.bp
index c87e3afc..19a1062a 100644
--- a/biometrics/Android.bp
+++ b/biometrics/Android.bp
@@ -1,5 +1,6 @@
1// This is an autogenerated file, do not edit. 1// This is an autogenerated file, do not edit.
2subdirs = [ 2subdirs = [
3 "fingerprint/2.1", 3 "fingerprint/2.1",
4 "fingerprint/2.1/default",
4 "fingerprint/2.1/vts/functional", 5 "fingerprint/2.1/vts/functional",
5] 6]
diff --git a/biometrics/fingerprint/2.1/default/Android.bp b/biometrics/fingerprint/2.1/default/Android.bp
new file mode 100644
index 00000000..e1d2cf70
--- /dev/null
+++ b/biometrics/fingerprint/2.1/default/Android.bp
@@ -0,0 +1,21 @@
1cc_binary {
2 name: "android.hardware.biometrics.fingerprint@2.1-service",
3 init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.rc"],
4 vendor: true,
5 relative_install_path: "hw",
6 srcs: [
7 "BiometricsFingerprint.cpp",
8 "service.cpp",
9 ],
10
11 shared_libs: [
12 "libcutils",
13 "liblog",
14 "libhidlbase",
15 "libhidltransport",
16 "libhardware",
17 "libutils",
18 "android.hardware.biometrics.fingerprint@2.1",
19 ],
20
21}
diff --git a/biometrics/fingerprint/2.1/default/Android.mk b/biometrics/fingerprint/2.1/default/Android.mk
deleted file mode 100644
index f02db946..00000000
--- a/biometrics/fingerprint/2.1/default/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-service
5LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.1-service.rc
6LOCAL_PROPRIETARY_MODULE := true
7LOCAL_MODULE_RELATIVE_PATH := hw
8LOCAL_SRC_FILES := \
9 BiometricsFingerprint.cpp \
10 service.cpp \
11
12LOCAL_SHARED_LIBRARIES := \
13 libcutils \
14 liblog \
15 libhidlbase \
16 libhidltransport \
17 libhardware \
18 libutils \
19 android.hardware.biometrics.fingerprint@2.1 \
20
21include $(BUILD_EXECUTABLE)
diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp
index 31a26414..63e75629 100644
--- a/bluetooth/1.0/default/Android.bp
+++ b/bluetooth/1.0/default/Android.bp
@@ -112,3 +112,23 @@ cc_test_host {
112 "liblog", 112 "liblog",
113 ], 113 ],
114} 114}
115
116cc_binary {
117 name: "android.hardware.bluetooth@1.0-service",
118 relative_install_path: "hw",
119 vendor: true,
120 init_rc: ["android.hardware.bluetooth@1.0-service.rc"],
121 srcs: ["service.cpp"],
122
123 shared_libs: [
124 "liblog",
125 "libcutils",
126 "libdl",
127 "libbase",
128 "libutils",
129 "libhardware",
130 "libhidlbase",
131 "libhidltransport",
132 "android.hardware.bluetooth@1.0",
133 ],
134}
diff --git a/bluetooth/1.0/default/Android.mk b/bluetooth/1.0/default/Android.mk
deleted file mode 100644
index 38294c77..00000000
--- a/bluetooth/1.0/default/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
1#
2# Copyright (C) 2016 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15
16LOCAL_PATH:= $(call my-dir)
17
18include $(CLEAR_VARS)
19LOCAL_MODULE_RELATIVE_PATH := hw
20LOCAL_PROPRIETARY_MODULE := true
21LOCAL_MODULE := android.hardware.bluetooth@1.0-service
22LOCAL_INIT_RC := android.hardware.bluetooth@1.0-service.rc
23LOCAL_SRC_FILES := \
24 service.cpp
25
26LOCAL_SHARED_LIBRARIES := \
27 liblog \
28 libcutils \
29 libdl \
30 libbase \
31 libutils \
32 libhardware \
33
34LOCAL_SHARED_LIBRARIES += \
35 libhidlbase \
36 libhidltransport \
37 android.hardware.bluetooth@1.0 \
38
39include $(BUILD_EXECUTABLE)
diff --git a/boot/1.0/default/Android.bp b/boot/1.0/default/Android.bp
new file mode 100644
index 00000000..c9b74925
--- /dev/null
+++ b/boot/1.0/default/Android.bp
@@ -0,0 +1,34 @@
1cc_library_shared {
2 name: "android.hardware.boot@1.0-impl",
3 relative_install_path: "hw",
4 vendor: true,
5 srcs: ["BootControl.cpp"],
6
7 shared_libs: [
8 "liblog",
9 "libhidlbase",
10 "libhidltransport",
11 "libhardware",
12 "libutils",
13 "android.hardware.boot@1.0",
14 ],
15
16}
17
18cc_binary {
19 name: "android.hardware.boot@1.0-service",
20 relative_install_path: "hw",
21 vendor: true,
22 init_rc: ["android.hardware.boot@1.0-service.rc"],
23 srcs: ["service.cpp"],
24
25 shared_libs: [
26 "liblog",
27 "libhardware",
28 "libhidlbase",
29 "libhidltransport",
30 "libutils",
31 "android.hardware.boot@1.0",
32 ],
33
34}
diff --git a/boot/1.0/default/Android.mk b/boot/1.0/default/Android.mk
deleted file mode 100644
index 5e7ecb40..00000000
--- a/boot/1.0/default/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE := android.hardware.boot@1.0-impl
5LOCAL_MODULE_RELATIVE_PATH := hw
6LOCAL_PROPRIETARY_MODULE := true
7LOCAL_SRC_FILES := \
8 BootControl.cpp \
9
10LOCAL_SHARED_LIBRARIES := \
11 liblog \
12 libhidlbase \
13 libhidltransport \
14 libhardware \
15 libutils \
16 android.hardware.boot@1.0 \
17
18include $(BUILD_SHARED_LIBRARY)
19
20include $(CLEAR_VARS)
21LOCAL_MODULE_RELATIVE_PATH := hw
22LOCAL_PROPRIETARY_MODULE := true
23LOCAL_MODULE := android.hardware.boot@1.0-service
24LOCAL_INIT_RC := android.hardware.boot@1.0-service.rc
25LOCAL_SRC_FILES := \
26 service.cpp
27
28LOCAL_SHARED_LIBRARIES := \
29 liblog \
30 libhardware \
31 libhidlbase \
32 libhidltransport \
33 libutils \
34 android.hardware.boot@1.0 \
35
36include $(BUILD_EXECUTABLE)
diff --git a/boot/Android.bp b/boot/Android.bp
index 33f70eba..ed19a370 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -1,5 +1,6 @@
1// This is an autogenerated file, do not edit. 1// This is an autogenerated file, do not edit.
2subdirs = [ 2subdirs = [
3 "1.0", 3 "1.0",
4 "1.0/default",
4 "1.0/vts/functional", 5 "1.0/vts/functional",
5] 6]
diff --git a/gatekeeper/1.0/default/Android.bp b/gatekeeper/1.0/default/Android.bp
new file mode 100644
index 00000000..4e6c9f04
--- /dev/null
+++ b/gatekeeper/1.0/default/Android.bp
@@ -0,0 +1,36 @@
1cc_library_shared {
2 name: "android.hardware.gatekeeper@1.0-impl",
3 relative_install_path: "hw",
4 vendor: true,
5
6 srcs: ["Gatekeeper.cpp"],
7
8 shared_libs: [
9 "android.hardware.gatekeeper@1.0",
10 "libhardware",
11 "libhidlbase",
12 "libhidltransport",
13 "libutils",
14 "liblog",
15 ],
16
17}
18
19cc_binary {
20 name: "android.hardware.gatekeeper@1.0-service",
21 relative_install_path: "hw",
22 vendor: true,
23 init_rc: ["android.hardware.gatekeeper@1.0-service.rc"],
24
25 srcs: ["service.cpp"],
26
27 shared_libs: [
28 "android.hardware.gatekeeper@1.0",
29 "libhardware",
30 "libhidlbase",
31 "libhidltransport",
32 "libutils",
33 "liblog",
34 ],
35
36}
diff --git a/gatekeeper/1.0/default/Android.mk b/gatekeeper/1.0/default/Android.mk
deleted file mode 100644
index d0845355..00000000
--- a/gatekeeper/1.0/default/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4
5LOCAL_MODULE_RELATIVE_PATH := hw
6LOCAL_PROPRIETARY_MODULE := true
7LOCAL_MODULE := android.hardware.gatekeeper@1.0-impl
8
9LOCAL_SRC_FILES := \
10 Gatekeeper.cpp \
11
12LOCAL_SHARED_LIBRARIES := \
13 android.hardware.gatekeeper@1.0 \
14 libhardware \
15 libhidlbase \
16 libhidltransport \
17 libutils \
18 liblog \
19
20include $(BUILD_SHARED_LIBRARY)
21
22include $(CLEAR_VARS)
23
24LOCAL_MODULE_RELATIVE_PATH := hw
25LOCAL_PROPRIETARY_MODULE := true
26LOCAL_MODULE := android.hardware.gatekeeper@1.0-service
27LOCAL_INIT_RC := android.hardware.gatekeeper@1.0-service.rc
28
29LOCAL_SRC_FILES := \
30 service.cpp \
31
32LOCAL_SHARED_LIBRARIES := \
33 android.hardware.gatekeeper@1.0 \
34 libhardware \
35 libhidlbase \
36 libhidltransport \
37 libutils \
38 liblog \
39
40include $(BUILD_EXECUTABLE)
diff --git a/gatekeeper/Android.bp b/gatekeeper/Android.bp
index 33f70eba..ed19a370 100644
--- a/gatekeeper/Android.bp
+++ b/gatekeeper/Android.bp
@@ -1,5 +1,6 @@
1// This is an autogenerated file, do not edit. 1// This is an autogenerated file, do not edit.
2subdirs = [ 2subdirs = [
3 "1.0", 3 "1.0",
4 "1.0/default",
4 "1.0/vts/functional", 5 "1.0/vts/functional",
5] 6]
diff --git a/gnss/1.0/default/Android.bp b/gnss/1.0/default/Android.bp
new file mode 100644
index 00000000..007ed975
--- /dev/null
+++ b/gnss/1.0/default/Android.bp
@@ -0,0 +1,54 @@
1cc_library_shared {
2 name: "android.hardware.gnss@1.0-impl",
3 vendor: true,
4 relative_install_path: "hw",
5 srcs: [
6 "ThreadCreationWrapper.cpp",
7 "AGnss.cpp",
8 "AGnssRil.cpp",
9 "Gnss.cpp",
10 "GnssBatching.cpp",
11 "GnssDebug.cpp",
12 "GnssGeofencing.cpp",
13 "GnssMeasurement.cpp",
14 "GnssNavigationMessage.cpp",
15 "GnssNi.cpp",
16 "GnssXtra.cpp",
17 "GnssConfiguration.cpp",
18 "GnssUtils.cpp",
19 ],
20
21 shared_libs: [
22 "liblog",
23 "libhidlbase",
24 "libhidltransport",
25 "libutils",
26 "android.hardware.gnss@1.0",
27 "libhardware",
28 ],
29
30 cflags: ["-Werror"],
31
32}
33
34cc_binary {
35 relative_install_path: "hw",
36 vendor: true,
37 name: "android.hardware.gnss@1.0-service",
38 init_rc: ["android.hardware.gnss@1.0-service.rc"],
39 srcs: ["service.cpp"],
40
41 shared_libs: [
42 "liblog",
43 "libcutils",
44 "libdl",
45 "libbase",
46 "libutils",
47 "libhardware",
48 "libbinder",
49 "libhidlbase",
50 "libhidltransport",
51 "android.hardware.gnss@1.0",
52 ],
53
54}
diff --git a/gnss/1.0/default/Android.mk b/gnss/1.0/default/Android.mk
deleted file mode 100644
index 34da64e2..00000000
--- a/gnss/1.0/default/Android.mk
+++ /dev/null
@@ -1,56 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE := android.hardware.gnss@1.0-impl
5LOCAL_PROPRIETARY_MODULE := true
6LOCAL_MODULE_RELATIVE_PATH := hw
7LOCAL_SRC_FILES := \
8 ThreadCreationWrapper.cpp \
9 AGnss.cpp \
10 AGnssRil.cpp \
11 Gnss.cpp \
12 GnssBatching.cpp \
13 GnssDebug.cpp \
14 GnssGeofencing.cpp \
15 GnssMeasurement.cpp \
16 GnssNavigationMessage.cpp \
17 GnssNi.cpp \
18 GnssXtra.cpp \
19 GnssConfiguration.cpp \
20 GnssUtils.cpp
21
22LOCAL_SHARED_LIBRARIES := \
23 liblog \
24 libhidlbase \
25 libhidltransport \
26 libutils \
27 android.hardware.gnss@1.0 \
28 libhardware
29
30LOCAL_CFLAGS += -Werror
31
32include $(BUILD_SHARED_LIBRARY)
33
34include $(CLEAR_VARS)
35LOCAL_MODULE_RELATIVE_PATH := hw
36LOCAL_PROPRIETARY_MODULE := true
37LOCAL_MODULE := android.hardware.gnss@1.0-service
38LOCAL_INIT_RC := android.hardware.gnss@1.0-service.rc
39LOCAL_SRC_FILES := \
40 service.cpp \
41
42LOCAL_SHARED_LIBRARIES := \
43 liblog \
44 libcutils \
45 libdl \
46 libbase \
47 libutils \
48 libhardware \
49 libbinder \
50
51LOCAL_SHARED_LIBRARIES += \
52 libhidlbase \
53 libhidltransport \
54 android.hardware.gnss@1.0 \
55
56include $(BUILD_EXECUTABLE)
diff --git a/gnss/Android.bp b/gnss/Android.bp
index 33f70eba..ed19a370 100644
--- a/gnss/Android.bp
+++ b/gnss/Android.bp
@@ -1,5 +1,6 @@
1// This is an autogenerated file, do not edit. 1// This is an autogenerated file, do not edit.
2subdirs = [ 2subdirs = [
3 "1.0", 3 "1.0",
4 "1.0/default",
4 "1.0/vts/functional", 5 "1.0/vts/functional",
5] 6]
diff --git a/sensors/1.0/default/Android.bp b/sensors/1.0/default/Android.bp
index 81445908..75fe3df7 100644
--- a/sensors/1.0/default/Android.bp
+++ b/sensors/1.0/default/Android.bp
@@ -40,4 +40,21 @@ cc_library_static {
40 local_include_dirs: ["include/sensors"], 40 local_include_dirs: ["include/sensors"],
41} 41}
42 42
43cc_binary {
44 name: "android.hardware.sensors@1.0-service",
45 relative_install_path: "hw",
46 vendor: true,
47 init_rc: ["android.hardware.sensors@1.0-service.rc"],
48 srcs: ["service.cpp"],
43 49
50 shared_libs: [
51 "liblog",
52 "libcutils",
53 "libdl",
54 "libbase",
55 "libutils",
56 "libhidlbase",
57 "libhidltransport",
58 "android.hardware.sensors@1.0",
59 ],
60}
diff --git a/sensors/1.0/default/Android.mk b/sensors/1.0/default/Android.mk
deleted file mode 100644
index d1145425..00000000
--- a/sensors/1.0/default/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
1LOCAL_PATH:= $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE_RELATIVE_PATH := hw
5LOCAL_PROPRIETARY_MODULE := true
6LOCAL_MODULE := android.hardware.sensors@1.0-service
7LOCAL_INIT_RC := android.hardware.sensors@1.0-service.rc
8LOCAL_SRC_FILES := \
9 service.cpp \
10
11LOCAL_SHARED_LIBRARIES := \
12 liblog \
13 libcutils \
14 libdl \
15 libbase \
16 libutils \
17
18LOCAL_SHARED_LIBRARIES += \
19 libhidlbase \
20 libhidltransport \
21 android.hardware.sensors@1.0 \
22
23include $(BUILD_EXECUTABLE)
diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp
index 1510509c..2054b88f 100644
--- a/thermal/1.0/default/Android.bp
+++ b/thermal/1.0/default/Android.bp
@@ -1,7 +1,22 @@
1//
2// Copyright (C) 2016 The Android Open Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15
1cc_library_shared { 16cc_library_shared {
2 name: "android.hardware.thermal@1.0-impl", 17 name: "android.hardware.thermal@1.0-impl",
3 defaults: ["hidl_defaults"], 18 defaults: ["hidl_defaults"],
4 proprietary: true, 19 vendor: true,
5 relative_install_path: "hw", 20 relative_install_path: "hw",
6 srcs: ["Thermal.cpp"], 21 srcs: ["Thermal.cpp"],
7 shared_libs: [ 22 shared_libs: [
@@ -16,3 +31,23 @@ cc_library_shared {
16 "android.hardware.thermal@1.0", 31 "android.hardware.thermal@1.0",
17 ], 32 ],
18} 33}
34
35cc_binary {
36 name: "android.hardware.thermal@1.0-service",
37 relative_install_path: "hw",
38 vendor: true,
39 init_rc: ["android.hardware.thermal@1.0-service.rc"],
40 srcs: ["service.cpp"],
41
42 shared_libs: [
43 "liblog",
44 "libcutils",
45 "libdl",
46 "libbase",
47 "libutils",
48 "libhardware",
49 "libhidlbase",
50 "libhidltransport",
51 "android.hardware.thermal@1.0",
52 ],
53}
diff --git a/thermal/1.0/default/Android.mk b/thermal/1.0/default/Android.mk
deleted file mode 100644
index 113020a8..00000000
--- a/thermal/1.0/default/Android.mk
+++ /dev/null
@@ -1,39 +0,0 @@
1#
2# Copyright (C) 2016 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15
16LOCAL_PATH:= $(call my-dir)
17
18include $(CLEAR_VARS)
19LOCAL_MODULE_RELATIVE_PATH := hw
20LOCAL_PROPRIETARY_MODULE := true
21LOCAL_MODULE := android.hardware.thermal@1.0-service
22LOCAL_INIT_RC := android.hardware.thermal@1.0-service.rc
23LOCAL_SRC_FILES := \
24 service.cpp \
25
26LOCAL_SHARED_LIBRARIES := \
27 liblog \
28 libcutils \
29 libdl \
30 libbase \
31 libutils \
32 libhardware \
33
34LOCAL_SHARED_LIBRARIES += \
35 libhidlbase \
36 libhidltransport \
37 android.hardware.thermal@1.0 \
38
39include $(BUILD_EXECUTABLE)
diff --git a/tv/Android.bp b/tv/Android.bp
index ac54910d..58d840ef 100644
--- a/tv/Android.bp
+++ b/tv/Android.bp
@@ -1,6 +1,8 @@
1// This is an autogenerated file, do not edit. 1// This is an autogenerated file, do not edit.
2subdirs = [ 2subdirs = [
3 "cec/1.0", 3 "cec/1.0",
4 "cec/1.0/default",
4 "input/1.0", 5 "input/1.0",
6 "input/1.0/default",
5 "input/1.0/vts/functional", 7 "input/1.0/vts/functional",
6] 8]
diff --git a/tv/cec/1.0/default/Android.bp b/tv/cec/1.0/default/Android.bp
new file mode 100644
index 00000000..efb88ec5
--- /dev/null
+++ b/tv/cec/1.0/default/Android.bp
@@ -0,0 +1,39 @@
1cc_library_shared {
2 name: "android.hardware.tv.cec@1.0-impl",
3 vendor: true,
4 relative_install_path: "hw",
5 srcs: ["HdmiCec.cpp"],
6
7 shared_libs: [
8 "libhidlbase",
9 "libhidltransport",
10 "liblog",
11 "libbase",
12 "libutils",
13 "libhardware",
14 "android.hardware.tv.cec@1.0",
15 ],
16
17}
18
19cc_binary {
20 name: "android.hardware.tv.cec@1.0-service",
21 relative_install_path: "hw",
22 vendor: true,
23 init_rc: ["android.hardware.tv.cec@1.0-service.rc"],
24 srcs: ["service.cpp"],
25
26 shared_libs: [
27 "liblog",
28 "libcutils",
29 "libdl",
30 "libbase",
31 "libutils",
32 "libhardware_legacy",
33 "libhardware",
34 "libhidlbase",
35 "libhidltransport",
36 "android.hardware.tv.cec@1.0",
37 ],
38
39}
diff --git a/tv/cec/1.0/default/Android.mk b/tv/cec/1.0/default/Android.mk
deleted file mode 100644
index 9d37344e..00000000
--- a/tv/cec/1.0/default/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE := android.hardware.tv.cec@1.0-impl
5LOCAL_PROPRIETARY_MODULE := true
6LOCAL_MODULE_RELATIVE_PATH := hw
7LOCAL_SRC_FILES := \
8 HdmiCec.cpp
9
10LOCAL_SHARED_LIBRARIES := \
11 libhidlbase \
12 libhidltransport \
13 liblog \
14 libbase \
15 libutils \
16 libhardware \
17 android.hardware.tv.cec@1.0 \
18
19include $(BUILD_SHARED_LIBRARY)
20
21
22include $(CLEAR_VARS)
23LOCAL_MODULE_RELATIVE_PATH := hw
24LOCAL_PROPRIETARY_MODULE := true
25LOCAL_MODULE := android.hardware.tv.cec@1.0-service
26LOCAL_INIT_RC := android.hardware.tv.cec@1.0-service.rc
27LOCAL_SRC_FILES := \
28 service.cpp \
29
30LOCAL_SHARED_LIBRARIES := \
31 liblog \
32 libcutils \
33 libdl \
34 libbase \
35 libutils \
36 libhardware_legacy \
37 libhardware \
38
39LOCAL_SHARED_LIBRARIES += \
40 libhidlbase \
41 libhidltransport \
42 android.hardware.tv.cec@1.0 \
43
44include $(BUILD_EXECUTABLE)
diff --git a/tv/input/1.0/default/Android.bp b/tv/input/1.0/default/Android.bp
new file mode 100644
index 00000000..f8956f18
--- /dev/null
+++ b/tv/input/1.0/default/Android.bp
@@ -0,0 +1,41 @@
1cc_library_shared {
2 name: "android.hardware.tv.input@1.0-impl",
3 vendor: true,
4 relative_install_path: "hw",
5 srcs: ["TvInput.cpp"],
6
7 shared_libs: [
8 "libbase",
9 "liblog",
10 "libhardware",
11 "libhidlbase",
12 "libhidltransport",
13 "libutils",
14 "android.hardware.audio.common@2.0",
15 "android.hardware.tv.input@1.0",
16 ],
17
18}
19
20cc_binary {
21 name: "android.hardware.tv.input@1.0-service",
22 relative_install_path: "hw",
23 vendor: true,
24 init_rc: ["android.hardware.tv.input@1.0-service.rc"],
25 srcs: ["service.cpp"],
26
27 shared_libs: [
28 "liblog",
29 "libcutils",
30 "libdl",
31 "libbase",
32 "libutils",
33 "libhardware_legacy",
34 "libhardware",
35 "libhidlbase",
36 "libhidltransport",
37 "android.hardware.audio.common@2.0",
38 "android.hardware.tv.input@1.0",
39 ],
40
41}
diff --git a/tv/input/1.0/default/Android.mk b/tv/input/1.0/default/Android.mk
deleted file mode 100644
index 210da86c..00000000
--- a/tv/input/1.0/default/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
1LOCAL_PATH := $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE := android.hardware.tv.input@1.0-impl
5LOCAL_PROPRIETARY_MODULE := true
6LOCAL_MODULE_RELATIVE_PATH := hw
7LOCAL_SRC_FILES := \
8 TvInput.cpp \
9
10LOCAL_SHARED_LIBRARIES := \
11 libbase \
12 liblog \
13 libhardware \
14 libhidlbase \
15 libhidltransport \
16 libutils \
17 android.hardware.audio.common@2.0 \
18 android.hardware.tv.input@1.0 \
19
20include $(BUILD_SHARED_LIBRARY)
21
22include $(CLEAR_VARS)
23LOCAL_MODULE_RELATIVE_PATH := hw
24LOCAL_PROPRIETARY_MODULE := true
25LOCAL_MODULE := android.hardware.tv.input@1.0-service
26LOCAL_INIT_RC := android.hardware.tv.input@1.0-service.rc
27LOCAL_SRC_FILES := \
28 service.cpp \
29
30LOCAL_SHARED_LIBRARIES := \
31 liblog \
32 libcutils \
33 libdl \
34 libbase \
35 libutils \
36 libhardware_legacy \
37 libhardware \
38
39LOCAL_SHARED_LIBRARIES += \
40 libhidlbase \
41 libhidltransport \
42 android.hardware.audio.common@2.0 \
43 android.hardware.tv.input@1.0 \
44
45include $(BUILD_EXECUTABLE)
46