Added option (TESTDPC_ALLOW_TEST_ONLY) to allow test-only on manifest.

Test: export TESTDPC_ALLOW_TEST_ONLY=true && ./gradlew assembleDebug && adb install -t ./out/gradle/TestDPC/build/outputs/apk/normal/debug/TestDPC-normal-debug.apk
Bug: 177564920

Change-Id: I838c87a9a183534ad239cbc4199dfe2f0a64a21e
(cherry picked from commit 6bff255822084f3e56a149f5b89095133d7b02f4)

Author: the-felipeal

app/build.gradle

@@ -126,15 +126,19 @@ private void stripTestOnlyForBuild(flavor, buildType) {
     def manifestPath =
             "${buildDir}/intermediates/manifests/full/${flavor}/${buildType}/AndroidManifest.xml"
     if (file(manifestPath).exists()) {
-        def xml = new XmlParser().parse(manifestPath)
-        def attributeNames = xml.application[0].attributes().collect { it.key }
-        attributeNames.each {
-            if (it.getLocalPart() == 'testOnly') {
-                xml.application[0].attributes().remove(it)
-                println "Removed testOnly attribute successfully!"
+        if (System.getenv('TESTDPC_ALLOW_TEST_ONLY') == 'true') {
+            println "NOT stripping testOnly from manifest because of TESTDPC_ALLOW_TEST_ONLY"
+        } else {
+            def xml = new XmlParser().parse(manifestPath)
+            def attributeNames = xml.application[0].attributes().collect { it.key }
+            attributeNames.each {
+                if (it.getLocalPart() == 'testOnly') {
+                    xml.application[0].attributes().remove(it)
+                    println "Removed testOnly attribute successfully!"
+                }
             }
+            new XmlNodePrinter(new PrintWriter(new FileWriter(manifestPath))).print(xml)
         }
-        new XmlNodePrinter(new PrintWriter(new FileWriter(manifestPath))).print(xml)
     }
 }
 

app/src/main/AndroidManifest.xml

@@ -33,7 +33,9 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
+    <!--  NOTE: android:testOnly will be stripped by build.fradle (stripTestOnlyForBuild()) -->
     <application
+            android:testOnly="true"
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"
             android:banner="@drawable/ic_launcher"