Remove abi from GMD config.

brettchabot · brettchabot · commit b3bb4c1c57c2 · 2022-05-02T12:12:52.000-07:00
diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle
@@ -28,7 +28,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/runner/AndroidJunitRunnerSample/app/build.gradle b/runner/AndroidJunitRunnerSample/app/build.gradle
@@ -32,7 +32,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/runner/AndroidTestOrchestratorSample/app/build.gradle b/runner/AndroidTestOrchestratorSample/app/build.gradle
@@ -34,7 +34,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/AccessibilitySample/app/build.gradle b/ui/espresso/AccessibilitySample/app/build.gradle
@@ -33,7 +33,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/BasicSample/app/build.gradle b/ui/espresso/BasicSample/app/build.gradle
@@ -35,7 +35,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/CustomMatcherSample/app/build.gradle b/ui/espresso/CustomMatcherSample/app/build.gradle
@@ -46,7 +46,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/DataAdapterSample/app/build.gradle b/ui/espresso/DataAdapterSample/app/build.gradle
@@ -28,7 +28,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/FragmentScenarioSample/app/build.gradle b/ui/espresso/FragmentScenarioSample/app/build.gradle
@@ -43,7 +43,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/IdlingResourceSample/app/build.gradle b/ui/espresso/IdlingResourceSample/app/build.gradle
@@ -46,7 +46,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/IntentsAdvancedSample/app/build.gradle b/ui/espresso/IntentsAdvancedSample/app/build.gradle
@@ -31,7 +31,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/IntentsBasicSample/app/build.gradle b/ui/espresso/IntentsBasicSample/app/build.gradle
@@ -31,7 +31,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/MultiProcessSample/app/build.gradle b/ui/espresso/MultiProcessSample/app/build.gradle
@@ -47,7 +47,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/MultiWindowSample/app/build.gradle b/ui/espresso/MultiWindowSample/app/build.gradle
@@ -38,7 +38,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/RecyclerViewSample/app/build.gradle b/ui/espresso/RecyclerViewSample/app/build.gradle
@@ -52,7 +52,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/ScreenshotSample/app/build.gradle b/ui/espresso/ScreenshotSample/app/build.gradle
@@ -42,7 +42,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.agpVersion = "7.3.0-alpha07"
+    ext.agpVersion = '7.3.0-alpha09'
     ext.kotlinVersion = "1.6.10"
     ext.androidxCoreVersion = "1.6.0"
     ext.buildToolsVersion = "31.0.0"
diff --git a/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/ScreenshotSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Sep 30 12:30:46 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ui/espresso/WebBasicSample/app/build.gradle b/ui/espresso/WebBasicSample/app/build.gradle
@@ -35,7 +35,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }
diff --git a/ui/uiautomator/BasicSample/app/build.gradle b/ui/uiautomator/BasicSample/app/build.gradle
@@ -34,7 +34,6 @@ android {
                 // The androidx.test screenshot APIs will automatically enable hardware rendering
                 // to take a screenshot
                 systemImageSource = "aosp-atd"
-                abi = "x86"
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ android {`
`28`	`28`	`// The androidx.test screenshot APIs will automatically enable hardware rendering`
`29`	`29`	`// to take a screenshot`
`30`	`30`	`systemImageSource = "aosp-atd"`
`31`		`- abi = "x86"`
`32`	`31`	`}`
`33`	`32`	`}`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ android {`
`32`	`32`	`// The androidx.test screenshot APIs will automatically enable hardware rendering`
`33`	`33`	`// to take a screenshot`
`34`	`34`	`systemImageSource = "aosp-atd"`
`35`		`- abi = "x86"`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ android {`
`34`	`34`	`// The androidx.test screenshot APIs will automatically enable hardware rendering`
`35`	`35`	`// to take a screenshot`
`36`	`36`	`systemImageSource = "aosp-atd"`
`37`		`- abi = "x86"`
`38`	`37`	`}`
`39`	`38`	`}`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ android {`
`33`	`33`	`// The androidx.test screenshot APIs will automatically enable hardware rendering`
`34`	`34`	`// to take a screenshot`
`35`	`35`	`systemImageSource = "aosp-atd"`
`36`		`- abi = "x86"`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ android {`
`35`	`35`	`// The androidx.test screenshot APIs will automatically enable hardware rendering`
`36`	`36`	`// to take a screenshot`
`37`	`37`	`systemImageSource = "aosp-atd"`
`38`		`- abi = "x86"`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ android {`
`46`	`46`	`// The androidx.test screenshot APIs will automatically enable hardware rendering`
`47`	`47`	`// to take a screenshot`
`48`	`48`	`systemImageSource = "aosp-atd"`
`49`		`- abi = "x86"`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ android {`
`43`	`43`	`// The androidx.test screenshot APIs will automatically enable hardware rendering`
`44`	`44`	`// to take a screenshot`
`45`	`45`	`systemImageSource = "aosp-atd"`
`46`		`- abi = "x86"`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ android {`
`31`	`31`	`// The androidx.test screenshot APIs will automatically enable hardware rendering`
`32`	`32`	`// to take a screenshot`
`33`	`33`	`systemImageSource = "aosp-atd"`
`34`		`- abi = "x86"`
`35`	`34`	`}`
`36`	`35`	`}`
`37`	`36`	`}`