PiperOrigin-RevId: 184726412

1 files changed, 3 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceRule.java
index adafacf475..666840bda0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceRule.java
@@ -102,15 +102,9 @@ public final class AndroidDeviceRule implements RuleDefinition {
         A list of apks to be installed on the device at boot time.
         <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
         .add(attr("platform_apks", LABEL_LIST).legacyAllowAnyFileType())
-        // This should be set to false when we globally enable the flag for cloud dex2oat.
-        // Setting it to True for now is a no-op today, but setting it to false will disable
-        // all Dex2Oat functionality. This will be changed back to false based on this release
-        // process
-        // 1. Set pregenerate_oat_files_for_tests with default to true.
-        // 2. Wait for a Blaze release. This should be a no-op.
-        // 3. Update all android_device rules and set value of cloud_dex2oat appropriately.
-        // 4. Change the default flag value to false.
-        .add(attr("pregenerate_oat_files_for_tests", BOOLEAN).value(true))
+        // Do not pregenerate oat files for tests by default unless the device
+        // supports it.
+        .add(attr("pregenerate_oat_files_for_tests", BOOLEAN).value(false))
         .add(
             attr("$adb_static", LABEL)
                 .cfg(HostTransition.INSTANCE)