diff options
author | Yuntao Xu <yuntaoxu@google.com> | 2021-05-05 01:25:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-05 01:25:23 +0000 |
commit | e50017c8ff8795c1bc69b2417f13331cddbf89dd (patch) | |
tree | c0726a51cec8ede53aa7796a05d2b75480ce0cd0 | |
parent | f28d83cefd748418a196736661b9df7c07195399 (diff) | |
parent | 84ed246fbe2aa1955ca234bcf313e4144ea3f97e (diff) | |
download | rs-android12-qpr3-s1-release.tar.gz |
Merge "Convert Android.mk to Android.bp" am: 301483980c am: 75436afd61 am: 84ed246fbeandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1690365
Change-Id: I509ab3fb820d34dbcfeb500a06e1cdaacdbaf2fd
-rw-r--r-- | tests/java_api/RsBLAS_Benchmark/Android.bp | 33 | ||||
-rw-r--r-- | tests/java_api/RsBLAS_Benchmark/Android.mk | 36 | ||||
-rw-r--r-- | tests/java_api/RsBLAS_Benchmark/libsgemm/Android.bp | 29 | ||||
-rw-r--r-- | tests/java_api/RsBLAS_Benchmark/libsgemm/Android.mk | 31 |
4 files changed, 62 insertions, 67 deletions
diff --git a/tests/java_api/RsBLAS_Benchmark/Android.bp b/tests/java_api/RsBLAS_Benchmark/Android.bp new file mode 100644 index 00000000..e5a088ef --- /dev/null +++ b/tests/java_api/RsBLAS_Benchmark/Android.bp @@ -0,0 +1,33 @@ +// +// 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: "RsBlasBenchmark", + static_libs: ["androidx.test.rules"], + libs: [ + "android.test.runner.stubs", + "android.test.base.stubs", + ], + test_suites: ["device-tests"], + srcs: ["src/**/*.java"], + sdk_version: "current", + jni_libs: ["libgemmdata"], +} diff --git a/tests/java_api/RsBLAS_Benchmark/Android.mk b/tests/java_api/RsBLAS_Benchmark/Android.mk deleted file mode 100644 index 182a3809..00000000 --- a/tests/java_api/RsBLAS_Benchmark/Android.mk +++ /dev/null @@ -1,36 +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_STATIC_JAVA_LIBRARIES := androidx.test.rules -LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs - -LOCAL_MODULE_TAGS := tests -LOCAL_COMPATIBILITY_SUITE += device-tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-renderscript-files-under, src) - -LOCAL_PACKAGE_NAME := RsBlasBenchmark -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_SDK_VERSION := current -LOCAL_JNI_SHARED_LIBRARIES := libgemmdata - -include $(BUILD_PACKAGE) -include $(LOCAL_PATH)/libsgemm/Android.mk diff --git a/tests/java_api/RsBLAS_Benchmark/libsgemm/Android.bp b/tests/java_api/RsBLAS_Benchmark/libsgemm/Android.bp new file mode 100644 index 00000000..9e4b7e23 --- /dev/null +++ b/tests/java_api/RsBLAS_Benchmark/libsgemm/Android.bp @@ -0,0 +1,29 @@ +// 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. + +// +// This is the shared library included by the JNI test app. +// + +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +cc_test_library { + name: "libgemmdata", + srcs: ["test_data.cpp"], + sdk_version: "current", + header_libs: ["jni_headers"], +} diff --git a/tests/java_api/RsBLAS_Benchmark/libsgemm/Android.mk b/tests/java_api/RsBLAS_Benchmark/libsgemm/Android.mk deleted file mode 100644 index 9e2257b1..00000000 --- a/tests/java_api/RsBLAS_Benchmark/libsgemm/Android.mk +++ /dev/null @@ -1,31 +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. - -# -# This is the shared library included by the JNI test app. -# -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := libgemmdata -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_MODULE_TAGS := tests -LOCAL_SRC_FILES := test_data.cpp -LOCAL_SDK_VERSION := current - -LOCAL_CFLAGS := -Wall -Werror -LOCAL_HEADER_LIBRARIES := jni_headers - -include $(BUILD_SHARED_LIBRARY) |