diff options
author | Yuntao Xu <yuntaoxu@google.com> | 2022-02-12 01:50:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-12 01:50:53 +0000 |
commit | 601409fa447b686d3b12a443c6198c8033c2a656 (patch) | |
tree | 7b954396a0633e7a76339734187d51a43f2b147d | |
parent | 923ffd6a85195ce7d397c9775c9acf54d940b386 (diff) | |
parent | f0515e4a1697df2a4d7b893c75ec8c6a2afb0249 (diff) | |
download | rs-601409fa447b686d3b12a443c6198c8033c2a656.tar.gz |
Merge "Convert HealingBrush/Android.mk to Android.bp" am: 0acf6dd2d9 am: f0515e4a16
Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1971823
Change-Id: I19cdea077f3586b475ef1d3772c889bed5766497
-rw-r--r-- | tests/java_api/HealingBrush/Android.bp | 61 | ||||
-rw-r--r-- | tests/java_api/HealingBrush/Android.mk | 42 |
2 files changed, 61 insertions, 42 deletions
diff --git a/tests/java_api/HealingBrush/Android.bp b/tests/java_api/HealingBrush/Android.bp new file mode 100644 index 00000000..b8843d5b --- /dev/null +++ b/tests/java_api/HealingBrush/Android.bp @@ -0,0 +1,61 @@ +// +// Copyright (C) 2015 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +android_test { + name: "HealingBrush", + srcs: [ + "src/**/*.java", + ":HealingBrush-rscript{HealingBrush.srcjar}", + ], + resource_zips: [ + ":HealingBrush-rscript{HealingBrush.res.zip}", + ], + static_libs: ["android-support-v8-renderscript"], + sdk_version: "current", + jni_libs: ["librsjni"], +} + +genrule { + name: "HealingBrush-rscript", + srcs: [ + "src/**/*.rscript", + ":rs_script_api", + ":rs_clang_headers", + ], + tools: [ + "llvm-rs-cc", + "soong_zip", + ], + out: [ + "HealingBrush.srcjar", + "HealingBrush.res.zip", + ], + cmd: "for f in $(locations src/**/*.rscript); do " + + " $(location llvm-rs-cc) -o $(genDir)/res/raw -p $(genDir)/src " + + " -target-api 21 -rs-package-name=androidx.renderscript " + + " -I $$(dirname $$(echo $(locations :rs_script_api) | awk '{ print $$1 }')) " + + " -I $$(dirname $$(echo $(locations :rs_clang_headers) | awk '{ print $$1 }')) $${f}; " + + "done && " + + "$(location soong_zip) -srcjar -o $(location HealingBrush.srcjar) -C $(genDir)/src -D $(genDir)/src &&" + + "$(location soong_zip) -o $(location HealingBrush.res.zip) -C $(genDir)/res -D $(genDir)/res", +} diff --git a/tests/java_api/HealingBrush/Android.mk b/tests/java_api/HealingBrush/Android.mk deleted file mode 100644 index 4ca12512..00000000 --- a/tests/java_api/HealingBrush/Android.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (C) 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-renderscript-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v8-renderscript - -LOCAL_PACKAGE_NAME := HealingBrush -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_SDK_VERSION := current -LOCAL_RENDERSCRIPT_TARGET_API := 19 -LOCAL_RENDERSCRIPT_COMPATIBILITY := 18 - -LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC) -LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \ - $(TOPDIR)external/clang/lib/Headers \ - $(TOPDIR)frameworks/rs/script_api/include - -LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=androidx.renderscript -LOCAL_JNI_SHARED_LIBRARIES := librsjni - -include $(BUILD_PACKAGE) |