diff options
| author | Colin Cross <ccross@android.com> | 2019-07-22 18:44:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-22 18:44:46 -0700 |
| commit | ea263d122ec5bd14f05364cac6387fd3bda5c4d8 (patch) | |
| tree | 02f0816b74a2beadf6c97b5a7209b94df4db5444 /platform_tools | |
| parent | fe8bec1ee17cec264e723ff194568fc1c229317f (diff) | |
| parent | 247a0c7ee2363e62677a6bb60db510ab8a8543b1 (diff) | |
| download | skqp-ea263d122ec5bd14f05364cac6387fd3bda5c4d8.tar.gz | |
Convert CtsSkQPTestCases to Android.bp
am: 247a0c7ee2
Change-Id: Ib255a48dba676d75555bb232eb0a5ea773581350
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/apps/skqp/src/main/Android.bp | 24 | ||||
| -rw-r--r-- | platform_tools/android/apps/skqp/src/main/Android.mk | 18 |
2 files changed, 24 insertions, 18 deletions
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) |