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 /gatekeeper | |
| 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 'gatekeeper')
| -rw-r--r-- | gatekeeper/1.0/default/Android.bp | 36 | ||||
| -rw-r--r-- | gatekeeper/1.0/default/Android.mk | 40 | ||||
| -rw-r--r-- | gatekeeper/Android.bp | 1 |
3 files changed, 37 insertions, 40 deletions
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", ] |