diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-07 20:19:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-07 20:19:22 +0000 |
| commit | b46c67462082763e3960423d53b5cfeb01086e2a (patch) | |
| tree | 15efdbaec73f97b0ff0471eeb53e9ca90f371aff | |
| parent | cb362bd089d3814c53d15270f24d46ee2edacada (diff) | |
| parent | c76050e22b77d29ad1469122ed4f3c12e96c88b5 (diff) | |
| download | Camera2-b46c67462082763e3960423d53b5cfeb01086e2a.tar.gz | |
Merge "Convert Camera2Tests Android.mk to Android.bp" into main am: 897e8bc240 am: e6d913b5bf am: c76050e22b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2814173
Change-Id: I3c83f1701eb59824a94dd5c38471a85981ccf726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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) |