From 247a0c7ee2363e62677a6bb60db510ab8a8543b1 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 18 Jul 2019 13:21:12 -0700
Subject: Convert CtsSkQPTestCases to Android.bp

See build/soong/README.md for more information.

Fixes:122332596
Test: atest CtsSkQPTestCases
Change-Id: If36ea097baa8dc0e8a8bb3dd0be4c9f96b709cb9
---
 .../android/apps/skqp/src/main/Android.bp          | 24 ++++++++++++++++++++++
 .../android/apps/skqp/src/main/Android.mk          | 18 ----------------
 2 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 platform_tools/android/apps/skqp/src/main/Android.bp
 delete mode 100644 platform_tools/android/apps/skqp/src/main/Android.mk

(limited to 'platform_tools')

diff --git a/platform_tools/android/apps/skqp/src/main/Android.bp b/platform_tools/android/apps/skqp/src/main/Android.bp
new file mode 100644
index 0000000000..8a567e6e48
--- /dev/null
+++ b/platform_tools/android/apps/skqp/src/main/Android.bp
@@ -0,0 +1,24 @@
+// Copyright 2019 Google LLC.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+android_test {
+    name: "CtsSkQPTestCases",
+    defaults: ["cts_defaults"],
+
+    test_suites: [
+        "cts",
+        "vts",
+        "general-tests",
+    ],
+    libs: ["android.test.runner.stubs"],
+    jni_libs: ["libskqp_app"],
+    compile_multilib: "both",
+
+    static_libs: [
+        "android-support-design",
+        "ctstestrunner-axt",
+    ],
+    srcs: ["java/**/*.java"],
+    sdk_version: "test_current",
+}
diff --git a/platform_tools/android/apps/skqp/src/main/Android.mk b/platform_tools/android/apps/skqp/src/main/Android.mk
deleted file mode 100644
index 18f4a5548a..0000000000
--- a/platform_tools/android/apps/skqp/src/main/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019 Google LLC.
-# 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_MODULE_TAGS := tests optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
-LOCAL_JNI_SHARED_LIBRARIES := libskqp_app
-LOCAL_MULTILIB := both
-LOCAL_USE_AAPT2 := true
-LOCAL_STATIC_ANDROID_LIBRARIES := android-support-design
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt
-LOCAL_SRC_FILES := $(call all-java-files-under, java)
-LOCAL_PACKAGE_NAME := CtsSkQPTestCases
-LOCAL_SDK_VERSION := test_current
-include $(BUILD_CTS_PACKAGE)
-- 
cgit v1.2.3