diff options
author | Steven Moreland | 2017-10-10 13:05:20 -0500 |
---|---|---|
committer | Steven Moreland | 2017-10-10 18:07:20 -0500 |
commit | c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9 (patch) | |
tree | 1a29996c5260aed3a1567384f29a2220603da788 /memtrack | |
parent | b74728a92e88c354cf5f4e07981095ed2c2e8840 (diff) | |
download | platform-hardware-interfaces-c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9.tar.gz platform-hardware-interfaces-c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9.tar.xz platform-hardware-interfaces-c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9.zip |
Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
Diffstat (limited to 'memtrack')
-rw-r--r-- | memtrack/1.0/Android.bp | 31 | ||||
-rw-r--r-- | memtrack/1.0/Android.mk | 121 |
2 files changed, 30 insertions, 122 deletions
diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp index fe88d0f8..0bbcae87 100644 --- a/memtrack/1.0/Android.bp +++ b/memtrack/1.0/Android.bp | |||
@@ -66,6 +66,36 @@ cc_library { | |||
66 | } | 66 | } |
67 | 67 | ||
68 | genrule { | 68 | genrule { |
69 | name: "android.hardware.memtrack-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.memtrack@1.0", | ||
72 | srcs: [ | ||
73 | ":android.hardware.memtrack@1.0_hal", | ||
74 | ], | ||
75 | out: [ | ||
76 | "android/hardware/memtrack/V1_0/MemtrackFlag.java", | ||
77 | "android/hardware/memtrack/V1_0/MemtrackRecord.java", | ||
78 | "android/hardware/memtrack/V1_0/MemtrackStatus.java", | ||
79 | "android/hardware/memtrack/V1_0/MemtrackType.java", | ||
80 | "android/hardware/memtrack/V1_0/IMemtrack.java", | ||
81 | ], | ||
82 | } | ||
83 | |||
84 | java_library { | ||
85 | name: "android.hardware.memtrack-V1.0-java", | ||
86 | no_framework_libs: true, | ||
87 | defaults: ["hidl-java-module-defaults"], | ||
88 | srcs: [":android.hardware.memtrack-V1.0-java_gen_java"], | ||
89 | libs: [ | ||
90 | "hwbinder", | ||
91 | "android.hidl.base-V1.0-java", | ||
92 | ] | ||
93 | } | ||
94 | |||
95 | // This package does not export any types. Not creating java constants export. | ||
96 | |||
97 | |||
98 | genrule { | ||
69 | name: "android.hardware.memtrack@1.0-adapter-helper_genc++", | 99 | name: "android.hardware.memtrack@1.0-adapter-helper_genc++", |
70 | tools: ["hidl-gen"], | 100 | tools: ["hidl-gen"], |
71 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", | 101 | cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.memtrack@1.0", |
@@ -89,7 +119,6 @@ genrule { | |||
89 | ], | 119 | ], |
90 | } | 120 | } |
91 | 121 | ||
92 | |||
93 | cc_library { | 122 | cc_library { |
94 | name: "android.hardware.memtrack@1.0-adapter-helper", | 123 | name: "android.hardware.memtrack@1.0-adapter-helper", |
95 | defaults: ["hidl-module-defaults"], | 124 | defaults: ["hidl-module-defaults"], |
diff --git a/memtrack/1.0/Android.mk b/memtrack/1.0/Android.mk deleted file mode 100644 index dfde3850..00000000 --- a/memtrack/1.0/Android.mk +++ /dev/null | |||
@@ -1,121 +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.memtrack-V1.0-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.hidl.base-V1.0-java \ | ||
17 | |||
18 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
19 | LOCAL_JAVA_LIBRARIES += core-oj hwbinder | ||
20 | |||
21 | # | ||
22 | # Build types.hal (MemtrackFlag) | ||
23 | # | ||
24 | GEN := $(intermediates)/android/hardware/memtrack/V1_0/MemtrackFlag.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.memtrack@1.0::types.MemtrackFlag | ||
35 | |||
36 | $(GEN): $(LOCAL_PATH)/types.hal | ||
37 | $(transform-generated-source) | ||
38 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
39 | |||
40 | # | ||
41 | # Build types.hal (MemtrackRecord) | ||
42 | # | ||
43 | GEN := $(intermediates)/android/hardware/memtrack/V1_0/MemtrackRecord.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.memtrack@1.0::types.MemtrackRecord | ||
54 | |||
55 | $(GEN): $(LOCAL_PATH)/types.hal | ||
56 | $(transform-generated-source) | ||
57 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
58 | |||
59 | # | ||
60 | # Build types.hal (MemtrackStatus) | ||
61 | # | ||
62 | GEN := $(intermediates)/android/hardware/memtrack/V1_0/MemtrackStatus.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.memtrack@1.0::types.MemtrackStatus | ||
73 | |||
74 | $(GEN): $(LOCAL_PATH)/types.hal | ||
75 | $(transform-generated-source) | ||
76 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
77 | |||
78 | # | ||
79 | # Build types.hal (MemtrackType) | ||
80 | # | ||
81 | GEN := $(intermediates)/android/hardware/memtrack/V1_0/MemtrackType.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.memtrack@1.0::types.MemtrackType | ||
92 | |||
93 | $(GEN): $(LOCAL_PATH)/types.hal | ||
94 | $(transform-generated-source) | ||
95 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
96 | |||
97 | # | ||
98 | # Build IMemtrack.hal | ||
99 | # | ||
100 | GEN := $(intermediates)/android/hardware/memtrack/V1_0/IMemtrack.java | ||
101 | $(GEN): $(HIDL) | ||
102 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
103 | $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IMemtrack.hal | ||
104 | $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal | ||
105 | $(GEN): $(LOCAL_PATH)/types.hal | ||
106 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
107 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
108 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
109 | -Ljava \ | ||
110 | -randroid.hardware:hardware/interfaces \ | ||
111 | -randroid.hidl:system/libhidl/transport \ | ||
112 | android.hardware.memtrack@1.0::IMemtrack | ||
113 | |||
114 | $(GEN): $(LOCAL_PATH)/IMemtrack.hal | ||
115 | $(transform-generated-source) | ||
116 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
117 | include $(BUILD_JAVA_LIBRARY) | ||
118 | |||
119 | |||
120 | |||
121 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||