summaryrefslogtreecommitdiffstats
path: root/light
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 /light
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 'light')
-rw-r--r--light/2.0/Android.bp32
-rw-r--r--light/2.0/Android.mk140
2 files changed, 31 insertions, 141 deletions
diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp
index f1ce5206..2e7d84a6 100644
--- a/light/2.0/Android.bp
+++ b/light/2.0/Android.bp
@@ -66,6 +66,37 @@ cc_library {
66} 66}
67 67
68genrule { 68genrule {
69 name: "android.hardware.light-V2.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.light@2.0",
72 srcs: [
73 ":android.hardware.light@2.0_hal",
74 ],
75 out: [
76 "android/hardware/light/V2_0/Brightness.java",
77 "android/hardware/light/V2_0/Flash.java",
78 "android/hardware/light/V2_0/LightState.java",
79 "android/hardware/light/V2_0/Status.java",
80 "android/hardware/light/V2_0/Type.java",
81 "android/hardware/light/V2_0/ILight.java",
82 ],
83}
84
85java_library {
86 name: "android.hardware.light-V2.0-java",
87 no_framework_libs: true,
88 defaults: ["hidl-java-module-defaults"],
89 srcs: [":android.hardware.light-V2.0-java_gen_java"],
90 libs: [
91 "hwbinder",
92 "android.hidl.base-V1.0-java",
93 ]
94}
95
96// This package does not export any types. Not creating java constants export.
97
98
99genrule {
69 name: "android.hardware.light@2.0-adapter-helper_genc++", 100 name: "android.hardware.light@2.0-adapter-helper_genc++",
70 tools: ["hidl-gen"], 101 tools: ["hidl-gen"],
71 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0", 102 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.light@2.0",
@@ -89,7 +120,6 @@ genrule {
89 ], 120 ],
90} 121}
91 122
92
93cc_library { 123cc_library {
94 name: "android.hardware.light@2.0-adapter-helper", 124 name: "android.hardware.light@2.0-adapter-helper",
95 defaults: ["hidl-module-defaults"], 125 defaults: ["hidl-module-defaults"],
diff --git a/light/2.0/Android.mk b/light/2.0/Android.mk
deleted file mode 100644
index 93211e19..00000000
--- a/light/2.0/Android.mk
+++ /dev/null
@@ -1,140 +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.light-V2.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 (Brightness)
23#
24GEN := $(intermediates)/android/hardware/light/V2_0/Brightness.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.light@2.0::types.Brightness
35
36$(GEN): $(LOCAL_PATH)/types.hal
37 $(transform-generated-source)
38LOCAL_GENERATED_SOURCES += $(GEN)
39
40#
41# Build types.hal (Flash)
42#
43GEN := $(intermediates)/android/hardware/light/V2_0/Flash.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.light@2.0::types.Flash
54
55$(GEN): $(LOCAL_PATH)/types.hal
56 $(transform-generated-source)
57LOCAL_GENERATED_SOURCES += $(GEN)
58
59#
60# Build types.hal (LightState)
61#
62GEN := $(intermediates)/android/hardware/light/V2_0/LightState.java
63$(GEN): $(HIDL)
64$(GEN): PRIVATE_HIDL := $(HIDL)
65$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
66$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
67$(GEN): PRIVATE_CUSTOM_TOOL = \
68 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
69 -Ljava \
70 -randroid.hardware:hardware/interfaces \
71 -randroid.hidl:system/libhidl/transport \
72 android.hardware.light@2.0::types.LightState
73
74$(GEN): $(LOCAL_PATH)/types.hal
75 $(transform-generated-source)
76LOCAL_GENERATED_SOURCES += $(GEN)
77
78#
79# Build types.hal (Status)
80#
81GEN := $(intermediates)/android/hardware/light/V2_0/Status.java
82$(GEN): $(HIDL)
83$(GEN): PRIVATE_HIDL := $(HIDL)
84$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
85$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
86$(GEN): PRIVATE_CUSTOM_TOOL = \
87 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
88 -Ljava \
89 -randroid.hardware:hardware/interfaces \
90 -randroid.hidl:system/libhidl/transport \
91 android.hardware.light@2.0::types.Status
92
93$(GEN): $(LOCAL_PATH)/types.hal
94 $(transform-generated-source)
95LOCAL_GENERATED_SOURCES += $(GEN)
96
97#
98# Build types.hal (Type)
99#
100GEN := $(intermediates)/android/hardware/light/V2_0/Type.java
101$(GEN): $(HIDL)
102$(GEN): PRIVATE_HIDL := $(HIDL)
103$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
104$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
105$(GEN): PRIVATE_CUSTOM_TOOL = \
106 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
107 -Ljava \
108 -randroid.hardware:hardware/interfaces \
109 -randroid.hidl:system/libhidl/transport \
110 android.hardware.light@2.0::types.Type
111
112$(GEN): $(LOCAL_PATH)/types.hal
113 $(transform-generated-source)
114LOCAL_GENERATED_SOURCES += $(GEN)
115
116#
117# Build ILight.hal
118#
119GEN := $(intermediates)/android/hardware/light/V2_0/ILight.java
120$(GEN): $(HIDL)
121$(GEN): PRIVATE_HIDL := $(HIDL)
122$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ILight.hal
123$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
124$(GEN): $(LOCAL_PATH)/types.hal
125$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
126$(GEN): PRIVATE_CUSTOM_TOOL = \
127 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
128 -Ljava \
129 -randroid.hardware:hardware/interfaces \
130 -randroid.hidl:system/libhidl/transport \
131 android.hardware.light@2.0::ILight
132
133$(GEN): $(LOCAL_PATH)/ILight.hal
134 $(transform-generated-source)
135LOCAL_GENERATED_SOURCES += $(GEN)
136include $(BUILD_JAVA_LIBRARY)
137
138
139
140include $(call all-makefiles-under,$(LOCAL_PATH))