summaryrefslogtreecommitdiffstats
path: root/boot
diff options
context:
space:
mode:
authorSteven Moreland2017-11-07 15:24:49 -0600
committerandroid-build-merger2017-11-07 15:24:49 -0600
commitd28c1bdf629236a6133a5acd6298198308fe7187 (patch)
tree13b4bbab7ada28f073dc98f042ff0bb4eecdf7c7 /boot
parentd4bb253b18a4a872f82f4bc6e17b9e5d113ffdf4 (diff)
parent26013bf6aca79fdb10c745b74cfd6aab948ca20d (diff)
downloadplatform-hardware-interfaces-d28c1bdf629236a6133a5acd6298198308fe7187.tar.gz
platform-hardware-interfaces-d28c1bdf629236a6133a5acd6298198308fe7187.tar.xz
platform-hardware-interfaces-d28c1bdf629236a6133a5acd6298198308fe7187.zip
Merge "Automatic mk -> bp." am: e5fd969f19 am: 72c720a4e3
am: 26013bf6ac Change-Id: Id936fb4806d122045c771c951220361efeef10c6
Diffstat (limited to 'boot')
-rw-r--r--boot/1.0/default/Android.bp34
-rw-r--r--boot/1.0/default/Android.mk36
-rw-r--r--boot/Android.bp1
3 files changed, 35 insertions, 36 deletions
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]