diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-30 02:39:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-30 02:39:46 +0000 |
commit | dfb51c07057663f64b20ee5d67317dc1a3615e09 (patch) | |
tree | feed71f2d5b0ad64a35af6b0ddc21f6422fff48d | |
parent | f373e7d790ff939a2b7708a5b1520b09a3fec44c (diff) | |
parent | dc266b72873854338e7c66d1f21065e8a9d7d2e4 (diff) | |
download | sdk-dfb51c07057663f64b20ee5d67317dc1a3615e09.tar.gz |
Merge "Convert prebuilts/sdk/renderscript to Android.bp" into rvc-dev am: dc266b7287
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/12220867
Change-Id: I6ea1c42b36dca53967cb8aea44b099eba4435e02
-rw-r--r-- | renderscript/Android.bp | 95 | ||||
-rw-r--r-- | renderscript/Android.mk | 84 |
2 files changed, 95 insertions, 84 deletions
diff --git a/renderscript/Android.bp b/renderscript/Android.bp new file mode 100644 index 000000000..42a2748c1 --- /dev/null +++ b/renderscript/Android.bp @@ -0,0 +1,95 @@ +// +// Copyright (C) 2013 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. +// + +//################################# +cc_prebuilt_library_shared { + name: "librsjni", + sdk_version: "23", + arch: { + arm: { + srcs: ["lib/arm/librsjni.so"], + }, + arm64: { + srcs: ["lib/arm64/librsjni.so"], + }, + x86: { + srcs: ["lib/x86/librsjni.so"], + }, + x86_64: { + srcs: ["lib/x86_64/librsjni.so"], + }, + }, +} + +//################################# +cc_prebuilt_library_shared { + name: "libRSSupport", + sdk_version: "23", + arch: { + arm: { + srcs: ["lib/arm/libRSSupport.so"], + }, + arm64: { + srcs: ["lib/arm64/libRSSupport.so"], + }, + x86: { + srcs: ["lib/x86/libRSSupport.so"], + }, + x86_64: { + srcs: ["lib/x86_64/libRSSupport.so"], + }, + }, +} + +//################################# +cc_prebuilt_library_shared { + name: "libRSSupportIO", + sdk_version: "23", + arch: { + arm: { + srcs: ["lib/arm/libRSSupportIO.so"], + }, + arm64: { + srcs: ["lib/arm64/libRSSupportIO.so"], + }, + x86: { + srcs: ["lib/x86/libRSSupportIO.so"], + }, + x86_64: { + srcs: ["lib/x86_64/libRSSupportIO.so"], + }, + }, +} + +//################################# +java_import { + name: "android-support-v8-renderscript", + jars: ["lib/javalib.jar"], + + // 23 as specified at frameworks/rs/support/Android.mk + sdk_version: "23", +} + +//################################# +java_import { + name: "android-support-v8-renderscript-legacy", + jars: ["lib/javalib_legacy.jar"], + + // 23 as specified at frameworks/rs/support/Android.mk + sdk_version: "23", +} + +//################################# diff --git a/renderscript/Android.mk b/renderscript/Android.mk deleted file mode 100644 index fb4b043ae..000000000 --- a/renderscript/Android.mk +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (C) 2013 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) - -ifneq (,$(TARGET_BUILD_APPS)) - -################################## -include $(CLEAR_VARS) - -LOCAL_MODULE := librsjni -LOCAL_SRC_FILES := lib/$(TARGET_ARCH)/$(LOCAL_MODULE).so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so - -include $(BUILD_PREBUILT) - -################################## -include $(CLEAR_VARS) - -LOCAL_MODULE := libRSSupport -LOCAL_SRC_FILES := lib/$(TARGET_ARCH)/$(LOCAL_MODULE).so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so - -include $(BUILD_PREBUILT) - -################################## -include $(CLEAR_VARS) - -LOCAL_MODULE := libRSSupportIO -LOCAL_SRC_FILES := lib/$(TARGET_ARCH)/$(LOCAL_MODULE).so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so - -include $(BUILD_PREBUILT) - -################################## -include $(CLEAR_VARS) - -LOCAL_MODULE := android-support-v8-renderscript -LOCAL_SRC_FILES := lib/javalib.jar -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .jar -LOCAL_UNINSTALLABLE_MODULE := true -# 23 as specified at frameworks/rs/support/Android.mk -LOCAL_SDK_VERSION := 23 - -include $(BUILD_PREBUILT) - -################################## -include $(CLEAR_VARS) - -LOCAL_MODULE := android-support-v8-renderscript-legacy -LOCAL_SRC_FILES := lib/javalib_legacy.jar -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .jar -LOCAL_UNINSTALLABLE_MODULE := true -# 23 as specified at frameworks/rs/support/Android.mk -LOCAL_SDK_VERSION := 23 - -include $(BUILD_PREBUILT) - -################################## - -endif # TARGET_BUILD_APPS |