diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-08 00:20:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-08 00:20:57 +0000 |
| commit | 7442b3823ba5c8d343685cdf5177ffdc607dc2b8 (patch) | |
| tree | af9c24ae8be5e0e71f028b7a1056a4468710a138 | |
| parent | 1c4717dda9ba156b4c48e5c6488af4ac5d59234b (diff) | |
| parent | 897e8bc2406b21326a341d6194be2bbc688c8268 (diff) | |
| download | Camera2-7442b3823ba5c8d343685cdf5177ffdc607dc2b8.tar.gz | |
Snap for 11066218 from 897e8bc2406b21326a341d6194be2bbc688c8268 to sdk-release
Change-Id: I4d71904f7f9259cb1c319ef79015f701478d22a4
| -rw-r--r-- | tests/Android.bp | 14 | ||||
| -rw-r--r-- | tests/Android.mk | 18 |
2 files changed, 14 insertions, 18 deletions
diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 000000000..0fb2874d2 --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,14 @@ +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +android_test { + name: "Camera2Tests", + sdk_version: "16", + srcs: ["src/**/*.java"], + instrumentation_for: "Camera2", +} + diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index 829e17cfc..000000000 --- a/tests/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -LOCAL_SDK_VERSION := 16 - -# Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := Camera2Tests -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -LOCAL_INSTRUMENTATION_FOR := Camera2 - -include $(BUILD_PACKAGE) |