diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-04-17 21:30:31 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-04-17 21:30:31 +0000 |
| commit | 1e99d62193167738dea9c5c859e7344df46e1861 (patch) | |
| tree | eaf739b6f7551476f999385b453a23135e038779 | |
| parent | 1ac909025652aa7f954371edecea979fe258bb47 (diff) | |
| parent | fa8ed33ffe32be96303457e709f45a388ba80693 (diff) | |
| download | skqp-1e99d62193167738dea9c5c859e7344df46e1861.tar.gz | |
Snap for 6405781 from fa8ed33ffe32be96303457e709f45a388ba80693 to sdk-releaseplatform-tools-30.0.1platform-tools-30.0.0
Change-Id: I3f553ecec09f4046ce468b6d01913bee3f84e203
4 files changed, 1 insertions, 5 deletions
diff --git a/platform_tools/android/apps/skqp/src/main/Android.bp b/platform_tools/android/apps/skqp/src/main/Android.bp index b57360671c..7b31d49e44 100644 --- a/platform_tools/android/apps/skqp/src/main/Android.bp +++ b/platform_tools/android/apps/skqp/src/main/Android.bp @@ -8,7 +8,6 @@ android_test { test_suites: [ "cts", - "vts", "vts10", ], libs: ["android.test.runner.stubs"], diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt index 83fb0b764b..618310ff22 100644 --- a/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt @@ -691,8 +691,6 @@ varied_text_ignorable_clip_no_lcd,-1 vertices,-1 vertices_batching,-1 vertices_scaled_shader,-1 -verylarge_picture_image,-1 -verylargebitmap,-1 wacky_yuv_formats,0 wacky_yuv_formats_cs,0 windowrectangles,-1 diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt index 3a9640896a..cda34eae32 100644 --- a/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt @@ -76,7 +76,6 @@ GrWrappedMipMappedTest HalfFloatAlphaTextureTest HalfFloatRGBATextureTest ImageEncode_Gpu -ImageFilterBlurLargeImage_Gpu ImageFilterCache_GPUBacked ImageFilterCache_ImageBackedGPU ImageFilterClippedPictureImageFilter_Gpu diff --git a/tools/skqp/release.sh b/tools/skqp/release.sh index f96fb9f673..d33178e14a 100755 --- a/tools/skqp/release.sh +++ b/tools/skqp/release.sh @@ -25,7 +25,7 @@ cat > platform_tools/android/apps/skqp/src/main/Android.mk <<- "EOM" include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests optional LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) - LOCAL_COMPATIBILITY_SUITE := cts vts general-tests + LOCAL_COMPATIBILITY_SUITE := cts vts10 general-tests LOCAL_JAVA_LIBRARIES := android.test.runner.stubs LOCAL_JNI_SHARED_LIBRARIES := libskqp_app LOCAL_MULTILIB := both |