diff options
author | Steven Moreland | 2017-10-11 11:23:54 -0500 |
---|---|---|
committer | android-build-merger | 2017-10-11 11:23:54 -0500 |
commit | 0fff75dee172d57536c2034e0a64f6d9bf0a0a7f (patch) | |
tree | e4e6555ec981cb590ca2237f052a514d4addbe81 /renderscript | |
parent | 6d1326ed8a0564e4e521c3ef44ec795e2a520289 (diff) | |
parent | c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9 (diff) | |
download | platform-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 'renderscript')
-rw-r--r-- | renderscript/1.0/Android.bp | 22 | ||||
-rw-r--r-- | renderscript/1.0/Android.mk | 41 |
2 files changed, 21 insertions, 42 deletions
diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp index 0fd51864..9b6f7a8e 100644 --- a/renderscript/1.0/Android.bp +++ b/renderscript/1.0/Android.bp | |||
@@ -73,6 +73,27 @@ cc_library { | |||
73 | ], | 73 | ], |
74 | } | 74 | } |
75 | 75 | ||
76 | // This package is not java compatible. Not creating java target. | ||
77 | |||
78 | genrule { | ||
79 | name: "android.hardware.renderscript-V1.0-java-constants_gen_java", | ||
80 | tools: ["hidl-gen"], | ||
81 | cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", | ||
82 | srcs: [ | ||
83 | ":android.hardware.renderscript@1.0_hal", | ||
84 | ], | ||
85 | out: [ | ||
86 | "android/hardware/renderscript/V1_0/Constants.java", | ||
87 | ], | ||
88 | } | ||
89 | |||
90 | java_library { | ||
91 | name: "android.hardware.renderscript-V1.0-java-constants", | ||
92 | no_framework_libs: true, | ||
93 | defaults: ["hidl-java-module-defaults"], | ||
94 | srcs: [":android.hardware.renderscript-V1.0-java-constants_gen_java"], | ||
95 | } | ||
96 | |||
76 | genrule { | 97 | genrule { |
77 | name: "android.hardware.renderscript@1.0-adapter-helper_genc++", | 98 | name: "android.hardware.renderscript@1.0-adapter-helper_genc++", |
78 | tools: ["hidl-gen"], | 99 | tools: ["hidl-gen"], |
@@ -99,7 +120,6 @@ genrule { | |||
99 | ], | 120 | ], |
100 | } | 121 | } |
101 | 122 | ||
102 | |||
103 | cc_library { | 123 | cc_library { |
104 | name: "android.hardware.renderscript@1.0-adapter-helper", | 124 | name: "android.hardware.renderscript@1.0-adapter-helper", |
105 | defaults: ["hidl-module-defaults"], | 125 | defaults: ["hidl-module-defaults"], |
diff --git a/renderscript/1.0/Android.mk b/renderscript/1.0/Android.mk deleted file mode 100644 index cdd580a3..00000000 --- a/renderscript/1.0/Android.mk +++ /dev/null | |||
@@ -1,41 +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.renderscript-V1.0-java-constants | ||
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 | GEN := $(intermediates)/android/hardware/renderscript/V1_0/Constants.java | ||
16 | $(GEN): $(HIDL) | ||
17 | $(GEN): $(LOCAL_PATH)/types.hal | ||
18 | $(GEN): $(LOCAL_PATH)/IContext.hal | ||
19 | $(GEN): $(LOCAL_PATH)/IDevice.hal | ||
20 | |||
21 | $(GEN): PRIVATE_HIDL := $(HIDL) | ||
22 | $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) | ||
23 | $(GEN): PRIVATE_CUSTOM_TOOL = \ | ||
24 | $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ | ||
25 | -Ljava-constants \ | ||
26 | -randroid.hardware:hardware/interfaces \ | ||
27 | -randroid.hidl:system/libhidl/transport \ | ||
28 | android.hardware.renderscript@1.0 | ||
29 | |||
30 | $(GEN): | ||
31 | $(transform-generated-source) | ||
32 | LOCAL_GENERATED_SOURCES += $(GEN) | ||
33 | # Avoid dependency cycle of framework.jar -> this-library -> framework.jar | ||
34 | LOCAL_NO_STANDARD_LIBRARIES := true | ||
35 | LOCAL_JAVA_LIBRARIES := core-oj | ||
36 | |||
37 | include $(BUILD_STATIC_JAVA_LIBRARY) | ||
38 | |||
39 | |||
40 | |||
41 | include $(call all-makefiles-under,$(LOCAL_PATH)) | ||