diff options
| author | yangbill <yangbill@google.com> | 2024-01-22 06:28:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-22 06:28:21 +0000 |
| commit | 77152681e128e84bd32edc57230d6670faa12c76 (patch) | |
| tree | 83ad5b8d4ffb09f75c678fbcff504c87c15c0ff1 | |
| parent | 427f802ebef7eb9a8c1ccf410fca3753abdbd8b7 (diff) | |
| parent | 69678074833080eb0e4ec62b44240b3c7454d4da (diff) | |
| download | v4l2_codec2-77152681e128e84bd32edc57230d6670faa12c76.tar.gz | |
Convert external/v4l2_codec2/tests using Android.bp am: 6967807483
Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/2897625
Change-Id: I568ddf8da4f521b1547ca8abeb8d718b1775fd9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/Android.mk | 3 | ||||
| -rw-r--r-- | tests/c2_e2e_test/Android.bp | 29 | ||||
| -rw-r--r-- | tests/c2_e2e_test/Android.mk | 30 |
3 files changed, 29 insertions, 33 deletions
diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index 7697ee4..0000000 --- a/tests/Android.mk +++ /dev/null @@ -1,3 +0,0 @@ -ifneq ($(filter external/v4l2_codec2,$(PRODUCT_SOONG_NAMESPACES)),) -include $(call all-subdir-makefiles) -endif
\ No newline at end of file diff --git a/tests/c2_e2e_test/Android.bp b/tests/c2_e2e_test/Android.bp new file mode 100644 index 0000000..b5b8f12 --- /dev/null +++ b/tests/c2_e2e_test/Android.bp @@ -0,0 +1,29 @@ +// Copyright 2019 The Chromium OS Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "external_v4l2_codec2_license", + ], +} + +android_test { + name: "C2E2ETest", + srcs: [ + "src/**/*.java", + ], + resource_dirs: ["res"], + sdk_version: "26", + jni_libs: [ + "libcodectest", + ], + compile_multilib: "both", + dist: { + targets: [ + "dist_files", + ], + }, +} + diff --git a/tests/c2_e2e_test/Android.mk b/tests/c2_e2e_test/Android.mk deleted file mode 100644 index aa97741..0000000 --- a/tests/c2_e2e_test/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2019 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SDK_VERSION := 26 - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/res \ - -LOCAL_MULTILIB := both -LOCAL_PACKAGE_NAME := C2E2ETest -LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD legacy_unencumbered -LOCAL_LICENSE_CONDITIONS := notice unencumbered -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE -LOCAL_JNI_SHARED_LIBRARIES := libcodectest -LOCAL_MODULE_TAGS := tests - -c2_e2e_test_apk := $(call intermediates-dir-for,APPS,C2E2ETest)/package.apk -$(call dist-for-goals,dist_files,$(c2_e2e_test_apk):C2E2ETest.apk) - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) |