diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-06 01:14:26 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-06 01:14:26 +0000 |
commit | 431c860a75011e48d2caad1825b22353f313528d (patch) | |
tree | c0726a51cec8ede53aa7796a05d2b75480ce0cd0 | |
parent | d1b3cb2daaa84acf080f2f74ae989bfbccf0fb72 (diff) | |
parent | e50017c8ff8795c1bc69b2417f13331cddbf89dd (diff) | |
download | rs-android12-s2-release.tar.gz |
Snap for 7339742 from e50017c8ff8795c1bc69b2417f13331cddbf89dd to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: Ic617dd4fcb29bbb46981fecdb84e213870c0e87c
-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) |