diff options
author | Steven Moreland | 2017-10-11 13:09:24 -0500 |
---|---|---|
committer | Steven Moreland | 2017-10-11 13:30:28 -0500 |
commit | f390f03aa41691939f95729f3989feac03ee2f83 (patch) | |
tree | bf28d1fe284968d4aeccd2148a260b02e2539fd9 /vibrator | |
parent | 1d7374c5e168c825b75185af53c77f4eae9eea2c (diff) | |
download | platform-hardware-interfaces-f390f03aa41691939f95729f3989feac03ee2f83.tar.gz platform-hardware-interfaces-f390f03aa41691939f95729f3989feac03ee2f83.tar.xz platform-hardware-interfaces-f390f03aa41691939f95729f3989feac03ee2f83.zip |
Update for Soong-only makefiles.
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
Diffstat (limited to 'vibrator')
-rw-r--r-- | vibrator/1.1/Android.bp | 46 | ||||
-rw-r--r-- | vibrator/1.1/Android.mk | 99 |
2 files changed, 45 insertions, 100 deletions
diff --git a/vibrator/1.1/Android.bp b/vibrator/1.1/Android.bp index 7ce19714..11985fda 100644 --- a/vibrator/1.1/Android.bp +++ b/vibrator/1.1/Android.bp | |||
@@ -68,6 +68,50 @@ cc_library { | |||
68 | } | 68 | } |
69 | 69 | ||
70 | genrule { | 70 | genrule { |
71 | name: "android.hardware.vibrator-V1.1-java_gen_java", | ||
72 | tools: ["hidl-gen"], | ||
73 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", | ||
74 | srcs: [ | ||
75 | ":android.hardware.vibrator@1.1_hal", | ||
76 | ], | ||
77 | out: [ | ||
78 | "android/hardware/vibrator/V1_1/Effect_1_1.java", | ||
79 | "android/hardware/vibrator/V1_1/IVibrator.java", | ||
80 | ], | ||
81 | } | ||
82 | |||
83 | java_library { | ||
84 | name: "android.hardware.vibrator-V1.1-java", | ||
85 | no_framework_libs: true, | ||
86 | defaults: ["hidl-java-module-defaults"], | ||
87 | srcs: [":android.hardware.vibrator-V1.1-java_gen_java"], | ||
88 | libs: [ | ||
89 | "hwbinder", | ||
90 | "android.hardware.vibrator-V1.0-java", | ||
91 | "android.hidl.base-V1.0-java", | ||
92 | ] | ||
93 | } | ||
94 | |||
95 | genrule { | ||
96 | name: "android.hardware.vibrator-V1.1-java-constants_gen_java", | ||
97 | tools: ["hidl-gen"], | ||
98 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", | ||
99 | srcs: [ | ||
100 | ":android.hardware.vibrator@1.1_hal", | ||
101 | ], | ||
102 | out: [ | ||
103 | "android/hardware/vibrator/V1_1/Constants.java", | ||
104 | ], | ||
105 | } | ||
106 | |||
107 | java_library { | ||
108 | name: "android.hardware.vibrator-V1.1-java-constants", | ||
109 | no_framework_libs: true, | ||
110 | defaults: ["hidl-java-module-defaults"], | ||
111 | srcs: [":android.hardware.vibrator-V1.1-java-constants_gen_java"], | ||
112 | } | ||
113 | |||
114 | genrule { | ||
71 | name: "android.hardware.vibrator@1.1-adapter-helper_genc++", | 115 | name: "android.hardware.vibrator@1.1-adapter-helper_genc++", |
72 | tools: ["hidl-gen"], | 116 | tools: ["hidl-gen"], |
73 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", | 117 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", |
@@ -91,7 +135,6 @@ genrule { | |||
91 | ], | 135 | ], |
92 | } | 136 | } |
93 | 137 | ||
94 | |||
95 | cc_library { | 138 | cc_library { |
96 | name: "android.hardware.vibrator@1.1-adapter-helper", | 139 | name: "android.hardware.vibrator@1.1-adapter-helper", |
97 | defaults: ["hidl-module-defaults"], | 140 | defaults: ["hidl-module-defaults"], |
@@ -134,6 +177,7 @@ genrule { | |||
134 | 177 | ||
135 | cc_test { | 178 | cc_test { |
136 | name: "android.hardware.vibrator@1.1-adapter", | 179 | name: "android.hardware.vibrator@1.1-adapter", |
180 | defaults: ["hidl-module-defaults"], | ||
137 | shared_libs: [ | 181 | shared_libs: [ |
138 | "libhidladapter", | 182 | "libhidladapter", |
139 | "libhidlbase", | 183 | "libhidlbase", |
diff --git a/vibrator/1.1/Android.mk b/vibrator/1.1/Android.mk deleted file mode 100644 index d08f8376..00000000 --- a/vibrator/1.1/Android.mk +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | # This file is autogenerated by hidl-gen. Do not edit manually. | ||
2 | |||
3 | LOCAL_PATH := $(call my-dir) | ||
4 | |||
5 | ################################################################################ | ||
6 | |||
7 | include $(CLEAR_VARS) | ||
8 | LOCAL_MODULE := android.hardware.vibrator-V1.1-java | ||
9 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | ||
10 | |||
11 | intermediates := $(call local-generated-sources-dir, COMMON) | ||
12 | |||
13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | ||
14 | |||
15 | LOCAL_JAVA_LIBRARIES := \ | ||
16 | android.hardware.vibrator-V1.0-java \ | ||
17 | android.hidl.base-V1.0-java \ | ||
18 | |||
19 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
20 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
21 | |||
22 | # | ||
23 | # Build types.hal (Effect_1_1) | ||
24 | # | ||
25 | GEN := $(intermediates)/android/hardware/vibrator/V1_1/Effect_1_1.java | ||
26 | $(GEN): $(HIDL) | ||
27 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
28 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal | ||
29 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
30 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
31 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
32 | -Ljava \ | ||
33 | -randroid.hardware:hardware/interfaces \ | ||
34 | -randroid.hidl:system/libhidl/transport \ | ||
35 | android.hardware.vibrator@1.1::types.Effect_1_1 | ||
36 | |||
37 | $(GEN): $(LOCAL_PATH)/types.hal | ||
38 | $(transform-generated-source) | ||
39 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
40 | |||
41 | # | ||
42 | # Build IVibrator.hal | ||
43 | # | ||
44 | GEN := $(intermediates)/android/hardware/vibrator/V1_1/IVibrator.java | ||
45 | $(GEN): $(HIDL) | ||
46 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
47 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVibrator.hal | ||
48 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
49 | $(GEN): $(LOCAL_PATH)/types.hal | ||
50 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
51 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
52 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
53 | -Ljava \ | ||
54 | -randroid.hardware:hardware/interfaces \ | ||
55 | -randroid.hidl:system/libhidl/transport \ | ||
56 | android.hardware.vibrator@1.1::IVibrator | ||
57 | |||
58 | $(GEN): $(LOCAL_PATH)/IVibrator.hal | ||
59 | $(transform-generated-source) | ||
60 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
61 | include $(BUILD_JAVA_LIBRARY) | ||
62 | |||
63 | |||
64 | ################################################################################ | ||
65 | |||
66 | include $(CLEAR_VARS) | ||
67 | LOCAL_MODULE := android.hardware.vibrator-V1.1-java-constants | ||
68 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | ||
69 | |||
70 | intermediates := $(call local-generated-sources-dir, COMMON) | ||
71 | |||
72 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | ||
73 | # | ||
74 | GEN := $(intermediates)/android/hardware/vibrator/V1_1/Constants.java | ||
75 | $(GEN): $(HIDL) | ||
76 | $(GEN): $(LOCAL_PATH)/types.hal | ||
77 | $(GEN): $(LOCAL_PATH)/IVibrator.hal | ||
78 | |||
79 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
80 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
81 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
82 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
83 | -Ljava-constants \ | ||
84 | -randroid.hardware:hardware/interfaces \ | ||
85 | -randroid.hidl:system/libhidl/transport \ | ||
86 | android.hardware.vibrator@1.1 | ||
87 | |||
88 | $(GEN): | ||
89 | $(transform-generated-source) | ||
90 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
91 | # Avoid dependency cycle of framework.jar -> this-library -> framework.jar | ||
92 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
93 | LOCAL_JAVA_LIBRARIES := core-oj | ||
94 | |||
95 | include $(BUILD_STATIC_JAVA_LIBRARY) | ||
96 | |||
97 | |||
98 | |||
99 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||