diff options
author | Steven Moreland <smoreland@google.com> | 2017-11-07 21:24:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-07 21:24:49 +0000 |
commit | d28c1bdf629236a6133a5acd6298198308fe7187 (patch) | |
tree | 13b4bbab7ada28f073dc98f042ff0bb4eecdf7c7 /tv/cec | |
parent | d4bb253b18a4a872f82f4bc6e17b9e5d113ffdf4 (diff) | |
parent | 26013bf6aca79fdb10c745b74cfd6aab948ca20d (diff) | |
download | android_hardware_interfaces-d28c1bdf629236a6133a5acd6298198308fe7187.tar.gz android_hardware_interfaces-d28c1bdf629236a6133a5acd6298198308fe7187.tar.bz2 android_hardware_interfaces-d28c1bdf629236a6133a5acd6298198308fe7187.zip |
Merge "Automatic mk -> bp." am: e5fd969f19 am: 72c720a4e3
am: 26013bf6ac
Change-Id: Id936fb4806d122045c771c951220361efeef10c6
Diffstat (limited to 'tv/cec')
-rw-r--r-- | tv/cec/1.0/default/Android.bp | 39 | ||||
-rw-r--r-- | tv/cec/1.0/default/Android.mk | 44 |
2 files changed, 39 insertions, 44 deletions
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) |