Snap for 11400057 from 69678074833080eb0e4ec62b44240b3c7454d4da to simpleperf-releasesimpleperf-release

Change-Id: Ifb5f3275beec3130becbe73498d48d0948d29737

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))