summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-10-11 11:23:54 -0500
committerandroid-build-merger2017-10-11 11:23:54 -0500
commit0fff75dee172d57536c2034e0a64f6d9bf0a0a7f (patch)
treee4e6555ec981cb590ca2237f052a514d4addbe81 /vibrator
parent6d1326ed8a0564e4e521c3ef44ec795e2a520289 (diff)
parentc3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9 (diff)
downloadplatform-hardware-interfaces-0fff75dee172d57536c2034e0a64f6d9bf0a0a7f.tar.gz
platform-hardware-interfaces-0fff75dee172d57536c2034e0a64f6d9bf0a0a7f.tar.xz
platform-hardware-interfaces-0fff75dee172d57536c2034e0a64f6d9bf0a0a7f.zip
Update for Soong java makefiles.
am: c3e80fa01e Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
Diffstat (limited to 'vibrator')
-rw-r--r--vibrator/1.0/Android.bp46
-rw-r--r--vibrator/1.0/Android.mk136
2 files changed, 45 insertions, 137 deletions
diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp
index 92896573..9055c5e0 100644
--- a/vibrator/1.0/Android.bp
+++ b/vibrator/1.0/Android.bp
@@ -66,6 +66,51 @@ cc_library {
66} 66}
67 67
68genrule { 68genrule {
69 name: "android.hardware.vibrator-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.vibrator@1.0",
72 srcs: [
73 ":android.hardware.vibrator@1.0_hal",
74 ],
75 out: [
76 "android/hardware/vibrator/V1_0/Effect.java",
77 "android/hardware/vibrator/V1_0/EffectStrength.java",
78 "android/hardware/vibrator/V1_0/Status.java",
79 "android/hardware/vibrator/V1_0/IVibrator.java",
80 ],
81}
82
83java_library {
84 name: "android.hardware.vibrator-V1.0-java",
85 no_framework_libs: true,
86 defaults: ["hidl-java-module-defaults"],
87 srcs: [":android.hardware.vibrator-V1.0-java_gen_java"],
88 libs: [
89 "hwbinder",
90 "android.hidl.base-V1.0-java",
91 ]
92}
93
94genrule {
95 name: "android.hardware.vibrator-V1.0-java-constants_gen_java",
96 tools: ["hidl-gen"],
97 cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0",
98 srcs: [
99 ":android.hardware.vibrator@1.0_hal",
100 ],
101 out: [
102 "android/hardware/vibrator/V1_0/Constants.java",
103 ],
104}
105
106java_library {
107 name: "android.hardware.vibrator-V1.0-java-constants",
108 no_framework_libs: true,
109 defaults: ["hidl-java-module-defaults"],
110 srcs: [":android.hardware.vibrator-V1.0-java-constants_gen_java"],
111}
112
113genrule {
69 name: "android.hardware.vibrator@1.0-adapter-helper_genc++", 114 name: "android.hardware.vibrator@1.0-adapter-helper_genc++",
70 tools: ["hidl-gen"], 115 tools: ["hidl-gen"],
71 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0", 116 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.0",
@@ -89,7 +134,6 @@ genrule {
89 ], 134 ],
90} 135}
91 136
92
93cc_library { 137cc_library {
94 name: "android.hardware.vibrator@1.0-adapter-helper", 138 name: "android.hardware.vibrator@1.0-adapter-helper",
95 defaults: ["hidl-module-defaults"], 139 defaults: ["hidl-module-defaults"],
diff --git a/vibrator/1.0/Android.mk b/vibrator/1.0/Android.mk
deleted file mode 100644
index 4e03392f..00000000
--- a/vibrator/1.0/Android.mk
+++ /dev/null
@@ -1,136 +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.vibrator-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 (Effect)
23#
24GEN := $(intermediates)/android/hardware/vibrator/V1_0/Effect.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.vibrator@1.0::types.Effect
35
36$(GEN): $(LOCAL_PATH)/types.hal
37 $(transform-generated-source)
38LOCAL_GENERATED_SOURCES += $(GEN)
39
40#
41# Build types.hal (EffectStrength)
42#
43GEN := $(intermediates)/android/hardware/vibrator/V1_0/EffectStrength.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.vibrator@1.0::types.EffectStrength
54
55$(GEN): $(LOCAL_PATH)/types.hal
56 $(transform-generated-source)
57LOCAL_GENERATED_SOURCES += $(GEN)
58
59#
60# Build types.hal (Status)
61#
62GEN := $(intermediates)/android/hardware/vibrator/V1_0/Status.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.vibrator@1.0::types.Status
73
74$(GEN): $(LOCAL_PATH)/types.hal
75 $(transform-generated-source)
76LOCAL_GENERATED_SOURCES += $(GEN)
77
78#
79# Build IVibrator.hal
80#
81GEN := $(intermediates)/android/hardware/vibrator/V1_0/IVibrator.java
82$(GEN): $(HIDL)
83$(GEN): PRIVATE_HIDL := $(HIDL)
84$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVibrator.hal
85$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
86$(GEN): $(LOCAL_PATH)/types.hal
87$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
88$(GEN): PRIVATE_CUSTOM_TOOL = \
89 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
90 -Ljava \
91 -randroid.hardware:hardware/interfaces \
92 -randroid.hidl:system/libhidl/transport \
93 android.hardware.vibrator@1.0::IVibrator
94
95$(GEN): $(LOCAL_PATH)/IVibrator.hal
96 $(transform-generated-source)
97LOCAL_GENERATED_SOURCES += $(GEN)
98include $(BUILD_JAVA_LIBRARY)
99
100
101################################################################################
102
103include $(CLEAR_VARS)
104LOCAL_MODULE := android.hardware.vibrator-V1.0-java-constants
105LOCAL_MODULE_CLASS := JAVA_LIBRARIES
106
107intermediates := $(call local-generated-sources-dir, COMMON)
108
109HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
110#
111GEN := $(intermediates)/android/hardware/vibrator/V1_0/Constants.java
112$(GEN): $(HIDL)
113$(GEN): $(LOCAL_PATH)/types.hal
114$(GEN): $(LOCAL_PATH)/IVibrator.hal
115
116$(GEN): PRIVATE_HIDL := $(HIDL)
117$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
118$(GEN): PRIVATE_CUSTOM_TOOL = \
119 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
120 -Ljava-constants \
121 -randroid.hardware:hardware/interfaces \
122 -randroid.hidl:system/libhidl/transport \
123 android.hardware.vibrator@1.0
124
125$(GEN):
126 $(transform-generated-source)
127LOCAL_GENERATED_SOURCES += $(GEN)
128# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
129LOCAL_NO_STANDARD_LIBRARIES := true
130LOCAL_JAVA_LIBRARIES := core-oj
131
132include $(BUILD_STATIC_JAVA_LIBRARY)
133
134
135
136include $(call all-makefiles-under,$(LOCAL_PATH))