Bug 1509572 - Part 3: Don't dump R.txt for every build. r=snorp
☠☠ backed out by 79ae8ec996e6 ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Mon, 26 Nov 2018 19:16:51 +0000
changeset 504553 bc6911d14ae0612c7f78858ca2ee3e4472911317
parent 504552 bd0729ff0bbc9dfcd109f2fb430361b1ea81b1cc
child 504554 122d6f1a1136f696c88481c1cb1d97451a952a77
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1509572
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1509572 - Part 3: Don't dump R.txt for every build. r=snorp This has never been as useful as anticipated: we really aren't seeing resource mismatches in the wild that need diagnostic aids. Depends on D12791 Differential Revision: https://phabricator.services.mozilla.com/D12792
mobile/android/app/build.gradle
taskcluster/ci/build/android.yml
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -492,40 +492,16 @@ android.applicationVariants.all { varian
 
                     manifestOutFile.write(XmlUtil.serialize(xml), 'UTF-8')
                 }
             })
         }
     }
 }
 
-android.applicationVariants.all { variant ->
-    def processResourcesTask = tasks["process${variant.name.capitalize()}Resources"]
-    def assembleTask = tasks["assemble${variant.name.capitalize()}"]
-
-    def dumpTask = task("dump${variant.name.capitalize()}RTxt", type: Copy) {
-        from "${project.buildDir}/intermediates/symbols"
-        into "${project.buildDir}/R/symbols-${System.env.AB_CD}"
-        include "**/R.txt"
-
-        includeEmptyDirs = false
-
-        // Force task to run.
-        outputs.upToDateWhen { false }
-
-        rename { filename ->
-            filename.replace 'R.txt', "R-${new Date().format('yyyyMMddHHmmssSSS')}.txt"
-        }
-
-        dependsOn processResourcesTask
-    }
-
-    assembleTask.dependsOn dumpTask
-}
-
 // Bug 1415298: make Robolectric find assets.  Fix adapted from
 // https://github.com/robolectric/robolectric/issues/2647.
 android.applicationVariants.all { variant ->
     def productFlavor = ""
     variant.productFlavors.each {
         productFlavor += "${it.name.capitalize()}"
     }
     def buildType = "${variant.buildType.name.capitalize()}"
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -15,19 +15,16 @@ android-api-16/debug:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk
@@ -70,19 +67,16 @@ android-api-16-ccov/debug:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/geckoview-androidTest.apk
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
               type: file
             - name: public/build/geckoview_example.apk
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
@@ -133,19 +127,16 @@ android-x86/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk
@@ -188,19 +179,16 @@ android-x86-fuzzing/debug:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/geckoview-androidTest.apk
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
               type: file
             - name: public/build/geckoview_example.apk
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
@@ -245,19 +233,16 @@ android-x86-nightly/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk
@@ -303,19 +288,16 @@ android-api-16/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk
@@ -359,19 +341,16 @@ android-api-16-without-google-play-servi
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             PERFHERDER_EXTRA_OPTIONS: android-api-16-without-google-play-services
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview_example.apk
@@ -418,19 +397,16 @@ android-api-16-nightly/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk
@@ -476,19 +452,16 @@ android-aarch64/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk
@@ -537,19 +510,16 @@ android-aarch64-nightly/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk
@@ -595,19 +565,16 @@ android-x86_64/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk
@@ -656,19 +623,16 @@ android-x86_64-nightly/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
         artifacts:
-            - name: public/android/R
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
-              type: directory
               # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
             - name: public/android/maven
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
               type: directory
             - name: public/build/target.maven.zip
               path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
               type: file
             - name: public/build/geckoview-androidTest.apk