From 90e3a50f03102f24e035f8da1ab03946b8a991c1 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 2 Nov 2017 14:16:29 -0700 Subject: 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 --- audio/Android.bp | 1 + audio/effect/2.0/default/Android.bp | 46 ++++++++++++++++++++++ audio/effect/2.0/default/Android.mk | 46 ---------------------- biometrics/Android.bp | 1 + biometrics/fingerprint/2.1/default/Android.bp | 21 ++++++++++ biometrics/fingerprint/2.1/default/Android.mk | 21 ---------- bluetooth/1.0/default/Android.bp | 20 ++++++++++ bluetooth/1.0/default/Android.mk | 39 ------------------- boot/1.0/default/Android.bp | 34 ++++++++++++++++ boot/1.0/default/Android.mk | 36 ----------------- boot/Android.bp | 1 + gatekeeper/1.0/default/Android.bp | 36 +++++++++++++++++ gatekeeper/1.0/default/Android.mk | 40 ------------------- gatekeeper/Android.bp | 1 + gnss/1.0/default/Android.bp | 54 ++++++++++++++++++++++++++ gnss/1.0/default/Android.mk | 56 --------------------------- gnss/Android.bp | 1 + sensors/1.0/default/Android.bp | 17 ++++++++ sensors/1.0/default/Android.mk | 23 ----------- thermal/1.0/default/Android.bp | 37 +++++++++++++++++- thermal/1.0/default/Android.mk | 39 ------------------- tv/Android.bp | 2 + tv/cec/1.0/default/Android.bp | 39 +++++++++++++++++++ tv/cec/1.0/default/Android.mk | 44 --------------------- tv/input/1.0/default/Android.bp | 41 ++++++++++++++++++++ tv/input/1.0/default/Android.mk | 46 ---------------------- 26 files changed, 351 insertions(+), 391 deletions(-) create mode 100644 audio/effect/2.0/default/Android.bp delete mode 100644 audio/effect/2.0/default/Android.mk create mode 100644 biometrics/fingerprint/2.1/default/Android.bp delete mode 100644 biometrics/fingerprint/2.1/default/Android.mk delete mode 100644 bluetooth/1.0/default/Android.mk create mode 100644 boot/1.0/default/Android.bp delete mode 100644 boot/1.0/default/Android.mk create mode 100644 gatekeeper/1.0/default/Android.bp delete mode 100644 gatekeeper/1.0/default/Android.mk create mode 100644 gnss/1.0/default/Android.bp delete mode 100644 gnss/1.0/default/Android.mk delete mode 100644 sensors/1.0/default/Android.mk delete mode 100644 thermal/1.0/default/Android.mk create mode 100644 tv/cec/1.0/default/Android.bp delete mode 100644 tv/cec/1.0/default/Android.mk create mode 100644 tv/input/1.0/default/Android.bp delete mode 100644 tv/input/1.0/default/Android.mk diff --git a/audio/Android.bp b/audio/Android.bp index 8046672ab..f4a5846f2 100644 --- a/audio/Android.bp +++ b/audio/Android.bp @@ -6,5 +6,6 @@ subdirs = [ "common/2.0/default", "common/test/utility", "effect/2.0", + "effect/2.0/default", "effect/2.0/vts/functional", ] diff --git a/audio/effect/2.0/default/Android.bp b/audio/effect/2.0/default/Android.bp new file mode 100644 index 000000000..79bb8b0d6 --- /dev/null +++ b/audio/effect/2.0/default/Android.bp @@ -0,0 +1,46 @@ +cc_library_shared { + name: "android.hardware.audio.effect@2.0-impl", + vendor: true, + relative_install_path: "hw", + srcs: [ + "AcousticEchoCancelerEffect.cpp", + "AudioBufferManager.cpp", + "AutomaticGainControlEffect.cpp", + "BassBoostEffect.cpp", + "Conversions.cpp", + "DownmixEffect.cpp", + "Effect.cpp", + "EffectsFactory.cpp", + "EnvironmentalReverbEffect.cpp", + "EqualizerEffect.cpp", + "LoudnessEnhancerEffect.cpp", + "NoiseSuppressionEffect.cpp", + "PresetReverbEffect.cpp", + "VirtualizerEffect.cpp", + "VisualizerEffect.cpp", + ], + + shared_libs: [ + "libbase", + "libcutils", + "libeffects", + "libfmq", + "libhidlbase", + "libhidlmemory", + "libhidltransport", + "liblog", + "libutils", + "android.hardware.audio.common@2.0", + "android.hardware.audio.common@2.0-util", + "android.hardware.audio.effect@2.0", + "android.hidl.memory@1.0", + ], + + header_libs: [ + "libaudio_system_headers", + "libaudioclient_headers", + "libeffects_headers", + "libhardware_headers", + "libmedia_headers", + ], +} diff --git a/audio/effect/2.0/default/Android.mk b/audio/effect/2.0/default/Android.mk deleted file mode 100644 index f89d4f7bc..000000000 --- a/audio/effect/2.0/default/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.audio.effect@2.0-impl -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := \ - AcousticEchoCancelerEffect.cpp \ - AudioBufferManager.cpp \ - AutomaticGainControlEffect.cpp \ - BassBoostEffect.cpp \ - Conversions.cpp \ - DownmixEffect.cpp \ - Effect.cpp \ - EffectsFactory.cpp \ - EnvironmentalReverbEffect.cpp \ - EqualizerEffect.cpp \ - LoudnessEnhancerEffect.cpp \ - NoiseSuppressionEffect.cpp \ - PresetReverbEffect.cpp \ - VirtualizerEffect.cpp \ - VisualizerEffect.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libcutils \ - libeffects \ - libfmq \ - libhidlbase \ - libhidlmemory \ - libhidltransport \ - liblog \ - libutils \ - android.hardware.audio.common@2.0 \ - android.hardware.audio.common@2.0-util \ - android.hardware.audio.effect@2.0 \ - android.hidl.memory@1.0 \ - -LOCAL_HEADER_LIBRARIES := \ - libaudio_system_headers \ - libaudioclient_headers \ - libeffects_headers \ - libhardware_headers \ - libmedia_headers \ - -include $(BUILD_SHARED_LIBRARY) diff --git a/biometrics/Android.bp b/biometrics/Android.bp index c87e3afc5..19a1062a0 100644 --- a/biometrics/Android.bp +++ b/biometrics/Android.bp @@ -1,5 +1,6 @@ // This is an autogenerated file, do not edit. subdirs = [ "fingerprint/2.1", + "fingerprint/2.1/default", "fingerprint/2.1/vts/functional", ] diff --git a/biometrics/fingerprint/2.1/default/Android.bp b/biometrics/fingerprint/2.1/default/Android.bp new file mode 100644 index 000000000..e1d2cf709 --- /dev/null +++ b/biometrics/fingerprint/2.1/default/Android.bp @@ -0,0 +1,21 @@ +cc_binary { + name: "android.hardware.biometrics.fingerprint@2.1-service", + init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.rc"], + vendor: true, + relative_install_path: "hw", + srcs: [ + "BiometricsFingerprint.cpp", + "service.cpp", + ], + + shared_libs: [ + "libcutils", + "liblog", + "libhidlbase", + "libhidltransport", + "libhardware", + "libutils", + "android.hardware.biometrics.fingerprint@2.1", + ], + +} diff --git a/biometrics/fingerprint/2.1/default/Android.mk b/biometrics/fingerprint/2.1/default/Android.mk deleted file mode 100644 index f02db9467..000000000 --- a/biometrics/fingerprint/2.1/default/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-service -LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.1-service.rc -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := \ - BiometricsFingerprint.cpp \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - liblog \ - libhidlbase \ - libhidltransport \ - libhardware \ - libutils \ - android.hardware.biometrics.fingerprint@2.1 \ - -include $(BUILD_EXECUTABLE) diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp index 31a26414e..63e75629b 100644 --- a/bluetooth/1.0/default/Android.bp +++ b/bluetooth/1.0/default/Android.bp @@ -112,3 +112,23 @@ cc_test_host { "liblog", ], } + +cc_binary { + name: "android.hardware.bluetooth@1.0-service", + relative_install_path: "hw", + vendor: true, + init_rc: ["android.hardware.bluetooth@1.0-service.rc"], + srcs: ["service.cpp"], + + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libbase", + "libutils", + "libhardware", + "libhidlbase", + "libhidltransport", + "android.hardware.bluetooth@1.0", + ], +} diff --git a/bluetooth/1.0/default/Android.mk b/bluetooth/1.0/default/Android.mk deleted file mode 100644 index 38294c77e..000000000 --- a/bluetooth/1.0/default/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.bluetooth@1.0-service -LOCAL_INIT_RC := android.hardware.bluetooth@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.bluetooth@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/boot/1.0/default/Android.bp b/boot/1.0/default/Android.bp new file mode 100644 index 000000000..c9b74925e --- /dev/null +++ b/boot/1.0/default/Android.bp @@ -0,0 +1,34 @@ +cc_library_shared { + name: "android.hardware.boot@1.0-impl", + relative_install_path: "hw", + vendor: true, + srcs: ["BootControl.cpp"], + + shared_libs: [ + "liblog", + "libhidlbase", + "libhidltransport", + "libhardware", + "libutils", + "android.hardware.boot@1.0", + ], + +} + +cc_binary { + name: "android.hardware.boot@1.0-service", + relative_install_path: "hw", + vendor: true, + init_rc: ["android.hardware.boot@1.0-service.rc"], + srcs: ["service.cpp"], + + shared_libs: [ + "liblog", + "libhardware", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.boot@1.0", + ], + +} diff --git a/boot/1.0/default/Android.mk b/boot/1.0/default/Android.mk deleted file mode 100644 index 5e7ecb40c..000000000 --- a/boot/1.0/default/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.boot@1.0-impl -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_SRC_FILES := \ - BootControl.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libhidlbase \ - libhidltransport \ - libhardware \ - libutils \ - android.hardware.boot@1.0 \ - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.boot@1.0-service -LOCAL_INIT_RC := android.hardware.boot@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libhardware \ - libhidlbase \ - libhidltransport \ - libutils \ - android.hardware.boot@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/boot/Android.bp b/boot/Android.bp index 33f70ebae..ed19a3703 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -1,5 +1,6 @@ // This is an autogenerated file, do not edit. subdirs = [ "1.0", + "1.0/default", "1.0/vts/functional", ] diff --git a/gatekeeper/1.0/default/Android.bp b/gatekeeper/1.0/default/Android.bp new file mode 100644 index 000000000..4e6c9f04a --- /dev/null +++ b/gatekeeper/1.0/default/Android.bp @@ -0,0 +1,36 @@ +cc_library_shared { + name: "android.hardware.gatekeeper@1.0-impl", + relative_install_path: "hw", + vendor: true, + + srcs: ["Gatekeeper.cpp"], + + shared_libs: [ + "android.hardware.gatekeeper@1.0", + "libhardware", + "libhidlbase", + "libhidltransport", + "libutils", + "liblog", + ], + +} + +cc_binary { + name: "android.hardware.gatekeeper@1.0-service", + relative_install_path: "hw", + vendor: true, + init_rc: ["android.hardware.gatekeeper@1.0-service.rc"], + + srcs: ["service.cpp"], + + shared_libs: [ + "android.hardware.gatekeeper@1.0", + "libhardware", + "libhidlbase", + "libhidltransport", + "libutils", + "liblog", + ], + +} diff --git a/gatekeeper/1.0/default/Android.mk b/gatekeeper/1.0/default/Android.mk deleted file mode 100644 index d08453555..000000000 --- a/gatekeeper/1.0/default/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.gatekeeper@1.0-impl - -LOCAL_SRC_FILES := \ - Gatekeeper.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - android.hardware.gatekeeper@1.0 \ - libhardware \ - libhidlbase \ - libhidltransport \ - libutils \ - liblog \ - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.gatekeeper@1.0-service -LOCAL_INIT_RC := android.hardware.gatekeeper@1.0-service.rc - -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - android.hardware.gatekeeper@1.0 \ - libhardware \ - libhidlbase \ - libhidltransport \ - libutils \ - liblog \ - -include $(BUILD_EXECUTABLE) diff --git a/gatekeeper/Android.bp b/gatekeeper/Android.bp index 33f70ebae..ed19a3703 100644 --- a/gatekeeper/Android.bp +++ b/gatekeeper/Android.bp @@ -1,5 +1,6 @@ // This is an autogenerated file, do not edit. subdirs = [ "1.0", + "1.0/default", "1.0/vts/functional", ] diff --git a/gnss/1.0/default/Android.bp b/gnss/1.0/default/Android.bp new file mode 100644 index 000000000..007ed975a --- /dev/null +++ b/gnss/1.0/default/Android.bp @@ -0,0 +1,54 @@ +cc_library_shared { + name: "android.hardware.gnss@1.0-impl", + vendor: true, + relative_install_path: "hw", + srcs: [ + "ThreadCreationWrapper.cpp", + "AGnss.cpp", + "AGnssRil.cpp", + "Gnss.cpp", + "GnssBatching.cpp", + "GnssDebug.cpp", + "GnssGeofencing.cpp", + "GnssMeasurement.cpp", + "GnssNavigationMessage.cpp", + "GnssNi.cpp", + "GnssXtra.cpp", + "GnssConfiguration.cpp", + "GnssUtils.cpp", + ], + + shared_libs: [ + "liblog", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.gnss@1.0", + "libhardware", + ], + + cflags: ["-Werror"], + +} + +cc_binary { + relative_install_path: "hw", + vendor: true, + name: "android.hardware.gnss@1.0-service", + init_rc: ["android.hardware.gnss@1.0-service.rc"], + srcs: ["service.cpp"], + + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libbase", + "libutils", + "libhardware", + "libbinder", + "libhidlbase", + "libhidltransport", + "android.hardware.gnss@1.0", + ], + +} diff --git a/gnss/1.0/default/Android.mk b/gnss/1.0/default/Android.mk deleted file mode 100644 index 34da64e25..000000000 --- a/gnss/1.0/default/Android.mk +++ /dev/null @@ -1,56 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.gnss@1.0-impl -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := \ - ThreadCreationWrapper.cpp \ - AGnss.cpp \ - AGnssRil.cpp \ - Gnss.cpp \ - GnssBatching.cpp \ - GnssDebug.cpp \ - GnssGeofencing.cpp \ - GnssMeasurement.cpp \ - GnssNavigationMessage.cpp \ - GnssNi.cpp \ - GnssXtra.cpp \ - GnssConfiguration.cpp \ - GnssUtils.cpp - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libhidlbase \ - libhidltransport \ - libutils \ - android.hardware.gnss@1.0 \ - libhardware - -LOCAL_CFLAGS += -Werror - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.gnss@1.0-service -LOCAL_INIT_RC := android.hardware.gnss@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware \ - libbinder \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.gnss@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/gnss/Android.bp b/gnss/Android.bp index 33f70ebae..ed19a3703 100644 --- a/gnss/Android.bp +++ b/gnss/Android.bp @@ -1,5 +1,6 @@ // This is an autogenerated file, do not edit. subdirs = [ "1.0", + "1.0/default", "1.0/vts/functional", ] diff --git a/sensors/1.0/default/Android.bp b/sensors/1.0/default/Android.bp index 81445908a..75fe3df7e 100644 --- a/sensors/1.0/default/Android.bp +++ b/sensors/1.0/default/Android.bp @@ -40,4 +40,21 @@ cc_library_static { local_include_dirs: ["include/sensors"], } +cc_binary { + name: "android.hardware.sensors@1.0-service", + relative_install_path: "hw", + vendor: true, + init_rc: ["android.hardware.sensors@1.0-service.rc"], + srcs: ["service.cpp"], + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libbase", + "libutils", + "libhidlbase", + "libhidltransport", + "android.hardware.sensors@1.0", + ], +} diff --git a/sensors/1.0/default/Android.mk b/sensors/1.0/default/Android.mk deleted file mode 100644 index d1145425c..000000000 --- a/sensors/1.0/default/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.sensors@1.0-service -LOCAL_INIT_RC := android.hardware.sensors@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.sensors@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp index 1510509c3..2054b88f7 100644 --- a/thermal/1.0/default/Android.bp +++ b/thermal/1.0/default/Android.bp @@ -1,7 +1,22 @@ +// +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + cc_library_shared { name: "android.hardware.thermal@1.0-impl", defaults: ["hidl_defaults"], - proprietary: true, + vendor: true, relative_install_path: "hw", srcs: ["Thermal.cpp"], shared_libs: [ @@ -16,3 +31,23 @@ cc_library_shared { "android.hardware.thermal@1.0", ], } + +cc_binary { + name: "android.hardware.thermal@1.0-service", + relative_install_path: "hw", + vendor: true, + init_rc: ["android.hardware.thermal@1.0-service.rc"], + srcs: ["service.cpp"], + + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libbase", + "libutils", + "libhardware", + "libhidlbase", + "libhidltransport", + "android.hardware.thermal@1.0", + ], +} diff --git a/thermal/1.0/default/Android.mk b/thermal/1.0/default/Android.mk deleted file mode 100644 index 113020a8b..000000000 --- a/thermal/1.0/default/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.thermal@1.0-service -LOCAL_INIT_RC := android.hardware.thermal@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.thermal@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/tv/Android.bp b/tv/Android.bp index ac54910d9..58d840ef6 100644 --- a/tv/Android.bp +++ b/tv/Android.bp @@ -1,6 +1,8 @@ // This is an autogenerated file, do not edit. subdirs = [ "cec/1.0", + "cec/1.0/default", "input/1.0", + "input/1.0/default", "input/1.0/vts/functional", ] diff --git a/tv/cec/1.0/default/Android.bp b/tv/cec/1.0/default/Android.bp new file mode 100644 index 000000000..efb88ec55 --- /dev/null +++ b/tv/cec/1.0/default/Android.bp @@ -0,0 +1,39 @@ +cc_library_shared { + name: "android.hardware.tv.cec@1.0-impl", + vendor: true, + relative_install_path: "hw", + srcs: ["HdmiCec.cpp"], + + shared_libs: [ + "libhidlbase", + "libhidltransport", + "liblog", + "libbase", + "libutils", + "libhardware", + "android.hardware.tv.cec@1.0", + ], + +} + +cc_binary { + name: "android.hardware.tv.cec@1.0-service", + relative_install_path: "hw", + vendor: true, + init_rc: ["android.hardware.tv.cec@1.0-service.rc"], + srcs: ["service.cpp"], + + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libbase", + "libutils", + "libhardware_legacy", + "libhardware", + "libhidlbase", + "libhidltransport", + "android.hardware.tv.cec@1.0", + ], + +} diff --git a/tv/cec/1.0/default/Android.mk b/tv/cec/1.0/default/Android.mk deleted file mode 100644 index 9d37344e5..000000000 --- a/tv/cec/1.0/default/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tv.cec@1.0-impl -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := \ - HdmiCec.cpp - -LOCAL_SHARED_LIBRARIES := \ - libhidlbase \ - libhidltransport \ - liblog \ - libbase \ - libutils \ - libhardware \ - android.hardware.tv.cec@1.0 \ - -include $(BUILD_SHARED_LIBRARY) - - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.tv.cec@1.0-service -LOCAL_INIT_RC := android.hardware.tv.cec@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware_legacy \ - libhardware \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.tv.cec@1.0 \ - -include $(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 000000000..f8956f18f --- /dev/null +++ b/tv/input/1.0/default/Android.bp @@ -0,0 +1,41 @@ +cc_library_shared { + name: "android.hardware.tv.input@1.0-impl", + vendor: true, + relative_install_path: "hw", + srcs: ["TvInput.cpp"], + + shared_libs: [ + "libbase", + "liblog", + "libhardware", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.audio.common@2.0", + "android.hardware.tv.input@1.0", + ], + +} + +cc_binary { + name: "android.hardware.tv.input@1.0-service", + relative_install_path: "hw", + vendor: true, + init_rc: ["android.hardware.tv.input@1.0-service.rc"], + srcs: ["service.cpp"], + + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libbase", + "libutils", + "libhardware_legacy", + "libhardware", + "libhidlbase", + "libhidltransport", + "android.hardware.audio.common@2.0", + "android.hardware.tv.input@1.0", + ], + +} diff --git a/tv/input/1.0/default/Android.mk b/tv/input/1.0/default/Android.mk deleted file mode 100644 index 210da86c8..000000000 --- a/tv/input/1.0/default/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tv.input@1.0-impl -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SRC_FILES := \ - TvInput.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - liblog \ - libhardware \ - libhidlbase \ - libhidltransport \ - libutils \ - android.hardware.audio.common@2.0 \ - android.hardware.tv.input@1.0 \ - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.tv.input@1.0-service -LOCAL_INIT_RC := android.hardware.tv.input@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware_legacy \ - libhardware \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.audio.common@2.0 \ - android.hardware.tv.input@1.0 \ - -include $(BUILD_EXECUTABLE) - -- cgit v1.2.3