summaryrefslogtreecommitdiffstats
path: root/boot
diff options
context:
space:
mode:
authorSteven Moreland2017-10-11 11:39:21 -0500
committerandroid-build-merger2017-10-11 11:39:21 -0500
commit1d7374c5e168c825b75185af53c77f4eae9eea2c (patch)
treea7eced61ea6707420e7f706a64f4db63c0ec4611 /boot
parent58e7856b4f72ea28f7a2be3943d80d1e4003af54 (diff)
parent116161d94eca370d3054f0fe34b2c9d8acce70c4 (diff)
downloadplatform-hardware-interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.tar.gz
platform-hardware-interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.tar.xz
platform-hardware-interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.zip
Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
am: 116161d94e Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
Diffstat (limited to 'boot')
-rw-r--r--boot/1.0/Android.bp29
-rw-r--r--boot/1.0/Android.mk83
2 files changed, 28 insertions, 84 deletions
diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp
index e15b2d04..98db2abc 100644
--- a/boot/1.0/Android.bp
+++ b/boot/1.0/Android.bp
@@ -66,6 +66,34 @@ cc_library {
66} 66}
67 67
68genrule { 68genrule {
69 name: "android.hardware.boot-V1.0-java_gen_java",
70 tools: ["hidl-gen"],
71 cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0",
72 srcs: [
73 ":android.hardware.boot@1.0_hal",
74 ],
75 out: [
76 "android/hardware/boot/V1_0/BoolResult.java",
77 "android/hardware/boot/V1_0/CommandResult.java",
78 "android/hardware/boot/V1_0/IBootControl.java",
79 ],
80}
81
82java_library {
83 name: "android.hardware.boot-V1.0-java",
84 no_framework_libs: true,
85 defaults: ["hidl-java-module-defaults"],
86 srcs: [":android.hardware.boot-V1.0-java_gen_java"],
87 libs: [
88 "hwbinder",
89 "android.hidl.base-V1.0-java",
90 ]
91}
92
93// This package does not export any types. Not creating java constants export.
94
95
96genrule {
69 name: "android.hardware.boot@1.0-adapter-helper_genc++", 97 name: "android.hardware.boot@1.0-adapter-helper_genc++",
70 tools: ["hidl-gen"], 98 tools: ["hidl-gen"],
71 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0", 99 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.boot@1.0",
@@ -89,7 +117,6 @@ genrule {
89 ], 117 ],
90} 118}
91 119
92
93cc_library { 120cc_library {
94 name: "android.hardware.boot@1.0-adapter-helper", 121 name: "android.hardware.boot@1.0-adapter-helper",
95 defaults: ["hidl-module-defaults"], 122 defaults: ["hidl-module-defaults"],
diff --git a/boot/1.0/Android.mk b/boot/1.0/Android.mk
deleted file mode 100644
index 253742b9..00000000
--- a/boot/1.0/Android.mk
+++ /dev/null
@@ -1,83 +0,0 @@
1# This file is autogenerated by hidl-gen. Do not edit manually.
2
3LOCAL_PATH := $(call my-dir)
4
5################################################################################
6
7include $(CLEAR_VARS)
8LOCAL_MODULE := android.hardware.boot-V1.0-java
9LOCAL_MODULE_CLASS := JAVA_LIBRARIES
10
11intermediates := $(call local-generated-sources-dir, COMMON)
12
13HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
14
15LOCAL_JAVA_LIBRARIES := \
16 android.hidl.base-V1.0-java \
17
18LOCAL_NO_STANDARD_LIBRARIES := true
19LOCAL_JAVA_LIBRARIES += core-oj hwbinder
20
21#
22# Build types.hal (BoolResult)
23#
24GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java
25$(GEN): $(HIDL)
26$(GEN): PRIVATE_HIDL := $(HIDL)
27$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
28$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
29$(GEN): PRIVATE_CUSTOM_TOOL = \
30 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
31 -Ljava \
32 -randroid.hardware:hardware/interfaces \
33 -randroid.hidl:system/libhidl/transport \
34 android.hardware.boot@1.0::types.BoolResult
35
36$(GEN): $(LOCAL_PATH)/types.hal
37 $(transform-generated-source)
38LOCAL_GENERATED_SOURCES += $(GEN)
39
40#
41# Build types.hal (CommandResult)
42#
43GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java
44$(GEN): $(HIDL)
45$(GEN): PRIVATE_HIDL := $(HIDL)
46$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
47$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
48$(GEN): PRIVATE_CUSTOM_TOOL = \
49 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
50 -Ljava \
51 -randroid.hardware:hardware/interfaces \
52 -randroid.hidl:system/libhidl/transport \
53 android.hardware.boot@1.0::types.CommandResult
54
55$(GEN): $(LOCAL_PATH)/types.hal
56 $(transform-generated-source)
57LOCAL_GENERATED_SOURCES += $(GEN)
58
59#
60# Build IBootControl.hal
61#
62GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java
63$(GEN): $(HIDL)
64$(GEN): PRIVATE_HIDL := $(HIDL)
65$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal
66$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
67$(GEN): $(LOCAL_PATH)/types.hal
68$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
69$(GEN): PRIVATE_CUSTOM_TOOL = \
70 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
71 -Ljava \
72 -randroid.hardware:hardware/interfaces \
73 -randroid.hidl:system/libhidl/transport \
74 android.hardware.boot@1.0::IBootControl
75
76$(GEN): $(LOCAL_PATH)/IBootControl.hal
77 $(transform-generated-source)
78LOCAL_GENERATED_SOURCES += $(GEN)
79include $(BUILD_JAVA_LIBRARY)
80
81
82
83include $(call all-makefiles-under,$(LOCAL_PATH))