diff options
Diffstat (limited to 'platform_tools/android/apps')
| -rw-r--r-- | platform_tools/android/apps/skqp/src/main/Android.mk | 41 | ||||
| -rw-r--r-- | platform_tools/android/apps/skqp/src/main/AndroidTest.xml | 41 |
2 files changed, 21 insertions, 61 deletions
diff --git a/platform_tools/android/apps/skqp/src/main/Android.mk b/platform_tools/android/apps/skqp/src/main/Android.mk index cdfdcd1995..18f4a5548a 100644 --- a/platform_tools/android/apps/skqp/src/main/Android.mk +++ b/platform_tools/android/apps/skqp/src/main/Android.mk @@ -1,49 +1,18 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# 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) - -# don't include this package in any target LOCAL_MODULE_TAGS := tests optional - LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) - -# Tag this module as a cts test artifact LOCAL_COMPATIBILITY_SUITE := cts vts general-tests - LOCAL_JAVA_LIBRARIES := android.test.runner.stubs - LOCAL_JNI_SHARED_LIBRARIES := libskqp_app - -# include both the 32 and 64 bit versions LOCAL_MULTILIB := both - LOCAL_USE_AAPT2 := true - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-design - -LOCAL_STATIC_JAVA_LIBRARIES := \ - ctstestrunner-axt - +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 - -# Enforce public / test api only LOCAL_SDK_VERSION := test_current - include $(BUILD_CTS_PACKAGE) diff --git a/platform_tools/android/apps/skqp/src/main/AndroidTest.xml b/platform_tools/android/apps/skqp/src/main/AndroidTest.xml index 5b0a7bb1f2..03dc042279 100644 --- a/platform_tools/android/apps/skqp/src/main/AndroidTest.xml +++ b/platform_tools/android/apps/skqp/src/main/AndroidTest.xml @@ -1,29 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2018 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +<!-- +Copyright 2019 Google LLC. +Use of this source code is governed by a BSD-style license that can be +found in the LICENSE file. --> <configuration description="Config for CTS SkQP test cases"> - <option name="test-suite-tag" value="cts" /> - <option name="config-descriptor:metadata" key="component" value="uitoolkit" /> - <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" /> - <option name="config-descriptor:metadata" key="parameter" value="multi_abi" /> - <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> - <option name="cleanup-apks" value="true" /> - <option name="test-file-name" value="CtsSkQPTestCases.apk" /> - </target_preparer> - <test class="com.android.tradefed.testtype.AndroidJUnitTest" > - <option name="package" value="org.skia.skqp" /> - <option name="runtime-hint" value="7m" /> - </test> +<option name="test-suite-tag" value="cts" /> +<option name="config-descriptor:metadata" key="component" value="uitoolkit" /> +<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" /> +<option name="config-descriptor:metadata" key="parameter" value="multi_abi" /> +<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> +<option name="cleanup-apks" value="true" /> +<option name="test-file-name" value="CtsSkQPTestCases.apk" /> +</target_preparer> +<test class="com.android.tradefed.testtype.AndroidJUnitTest" > +<option name="package" value="org.skia.skqp" /> +<option name="runtime-hint" value="7m" /> +</test> </configuration> |