diff options
| author | Steven Moreland <smoreland@google.com> | 2017-10-11 16:31:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 16:31:07 +0000 |
| commit | 116161d94eca370d3054f0fe34b2c9d8acce70c4 (patch) | |
| tree | b21afcef8f711ad0fcfe57b6364716b90d5c3ffb /renderscript | |
| parent | 0d311f86e1596d1e9fb3d1c41bbec2c248cf070d (diff) | |
| parent | 6c811964a11b2edb15fc4c760e80701cc6113f3d (diff) | |
Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1
Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
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 0fd5186449..9b6f7a8e34 100644 --- a/renderscript/1.0/Android.bp +++ b/renderscript/1.0/Android.bp @@ -73,6 +73,27 @@ cc_library { ], } +// This package is not java compatible. Not creating java target. + +genrule { + name: "android.hardware.renderscript-V1.0-java-constants_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", + srcs: [ + ":android.hardware.renderscript@1.0_hal", + ], + out: [ + "android/hardware/renderscript/V1_0/Constants.java", + ], +} + +java_library { + name: "android.hardware.renderscript-V1.0-java-constants", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.renderscript-V1.0-java-constants_gen_java"], +} + genrule { name: "android.hardware.renderscript@1.0-adapter-helper_genc++", tools: ["hidl-gen"], @@ -99,7 +120,6 @@ genrule { ], } - cc_library { name: "android.hardware.renderscript@1.0-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/renderscript/1.0/Android.mk b/renderscript/1.0/Android.mk deleted file mode 100644 index cdd580a3db..0000000000 --- a/renderscript/1.0/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.renderscript-V1.0-java-constants -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) -# -GEN := $(intermediates)/android/hardware/renderscript/V1_0/Constants.java -$(GEN): $(HIDL) -$(GEN): $(LOCAL_PATH)/types.hal -$(GEN): $(LOCAL_PATH)/IContext.hal -$(GEN): $(LOCAL_PATH)/IDevice.hal - -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava-constants \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.renderscript@1.0 - -$(GEN): - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -# Avoid dependency cycle of framework.jar -> this-library -> framework.jar -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj - -include $(BUILD_STATIC_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) |