Clean up benchmark test AndroidManifest.xml files
Fixes: 187099834
Test: ./gradlew ads:ads-identifier-benchmark:cC
Test: presubmit
Updates to AGP have added proper support for the profileable tag, and
with the benchmark plugin, debuggable=false override hasn't been
necessary for a long while.
Change-Id: I066bf7439eb966a422cb30a08e884522db900b79
diff --git a/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml b/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
index a5b8f03..e50ddd3 100644
--- a/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
+++ b/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,10 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.ads.identifier.benchmark">
-
- <!-- Important: disable debuggable for accurate performance results -->
<application
- android:name=".AdsIdentifierBenchmarkApplication"
- android:debuggable="false">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ android:name=".AdsIdentifierBenchmarkApplication">
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml b/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml
index 1c5fab4..295021a 100644
--- a/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml
+++ b/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.appcompat.benchmark.test">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
<activity android:name="androidx.appcompat.app.AppCompatActivity"
android:theme="@style/Theme.AppCompat"/>
diff --git a/benchmark/benchmark/src/androidTest/AndroidManifest.xml b/benchmark/benchmark/src/androidTest/AndroidManifest.xml
index b20d8c1..573a5bd 100644
--- a/benchmark/benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.benchmark.benchmark.test">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index 45da2fe..3126a21 100644
--- a/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
@@ -26,7 +26,6 @@
tools:ignore="MissingApplicationIcon">
<!-- Profileable to enable macrobenchmark profiling -->
- <!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
<!--
diff --git a/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml b/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml
index 3362f60..ffa7768 100644
--- a/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,10 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.benchmark.integration.startup.benchmark.test">
<application
- android:name="androidx.benchmark.integration.startup.benchmark.ArgumentInjectingApplication"
- android:debuggable="false"
- tools:ignore="HardcodedDebugMode"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
- <profileable shell="true"/>
+ android:name="androidx.benchmark.integration.startup.benchmark.ArgumentInjectingApplication">
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
+ <profileable android:shell="true"/>
</application>
</manifest>
diff --git a/collection/collection-benchmark/src/androidTest/AndroidManifest.xml b/collection/collection-benchmark/src/androidTest/AndroidManifest.xml
index 1664e8d..82c5e06 100644
--- a/collection/collection-benchmark/src/androidTest/AndroidManifest.xml
+++ b/collection/collection-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.collection.benchmark.test">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/animation/animation-core/benchmark/src/androidTest/AndroidManifest.xml b/compose/animation/animation-core/benchmark/src/androidTest/AndroidManifest.xml
index fea4215..930962e 100644
--- a/compose/animation/animation-core/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/animation/animation-core/benchmark/src/androidTest/AndroidManifest.xml
@@ -15,17 +15,9 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.animation.core.benchmark">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/benchmark-utils/benchmark/src/androidTest/AndroidManifest.xml b/compose/benchmark-utils/benchmark/src/androidTest/AndroidManifest.xml
index b4b3fae..79f2534 100644
--- a/compose/benchmark-utils/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/benchmark-utils/benchmark/src/androidTest/AndroidManifest.xml
@@ -15,17 +15,9 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.benchmarkutils.benchmark">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/benchmark-utils/src/androidTest/AndroidManifest.xml b/compose/benchmark-utils/src/androidTest/AndroidManifest.xml
index 6aca4a1..ce8f343 100644
--- a/compose/benchmark-utils/src/androidTest/AndroidManifest.xml
+++ b/compose/benchmark-utils/src/androidTest/AndroidManifest.xml
@@ -14,5 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.compose.benchmarkutils"/>
+<manifest package="androidx.compose.benchmarkutils"/>
diff --git a/compose/foundation/foundation-layout/benchmark/src/androidTest/AndroidManifest.xml b/compose/foundation/foundation-layout/benchmark/src/androidTest/AndroidManifest.xml
index 9dc14a7..30a2807 100644
--- a/compose/foundation/foundation-layout/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/foundation/foundation-layout/benchmark/src/androidTest/AndroidManifest.xml
@@ -15,17 +15,9 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.foundation.layout.benchmark">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/foundation/foundation-layout/src/androidAndroidTest/AndroidManifest.xml b/compose/foundation/foundation-layout/src/androidAndroidTest/AndroidManifest.xml
index b78e515..26b9764 100644
--- a/compose/foundation/foundation-layout/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/foundation/foundation-layout/src/androidAndroidTest/AndroidManifest.xml
@@ -16,17 +16,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.foundation.layout">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- ~ requestLegacyExternalStorage to enable legacy JSON reporting when targeting Q
- -->
- <application
- android:requestLegacyExternalStorage="true"
- android:debuggable="false"
- tools:ignore="HardcodedDebugMode"
- tools:replace="android:debuggable">
-
+ <application>
<activity
android:name="androidx.compose.foundation.layout.TestActivity"
android:theme="@android:style/Theme.Material.NoActionBar.Fullscreen" />
diff --git a/compose/foundation/foundation/benchmark/src/androidTest/AndroidManifest.xml b/compose/foundation/foundation/benchmark/src/androidTest/AndroidManifest.xml
index 58b2405..e0847ac 100644
--- a/compose/foundation/foundation/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/foundation/foundation/benchmark/src/androidTest/AndroidManifest.xml
@@ -15,17 +15,9 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.foundation.benchmark">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index c796e40..934f94f 100644
--- a/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
@@ -26,7 +26,6 @@
tools:ignore="GoogleAppIndexingWarning">
<!-- Profileable to enable macrobenchmark profiling -->
- <!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
<!--
diff --git a/compose/material/material/benchmark/src/androidTest/AndroidManifest.xml b/compose/material/material/benchmark/src/androidTest/AndroidManifest.xml
index f19b2d8..e473cdc 100644
--- a/compose/material/material/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/material/material/benchmark/src/androidTest/AndroidManifest.xml
@@ -15,17 +15,9 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.material.benchmark">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/runtime/runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml b/compose/runtime/runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
index 0eb4313..7622f47 100644
--- a/compose/runtime/runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,16 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.runtime.benchmark">
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
<activity
diff --git a/compose/ui/ui-graphics/benchmark/src/androidTest/AndroidManifest.xml b/compose/ui/ui-graphics/benchmark/src/androidTest/AndroidManifest.xml
index b5d6704..33d38e6 100644
--- a/compose/ui/ui-graphics/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/benchmark/src/androidTest/AndroidManifest.xml
@@ -15,17 +15,9 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.ui.graphics.benchmark">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/ui/ui-graphics/benchmark/test/src/androidTest/AndroidManifest.xml b/compose/ui/ui-graphics/benchmark/test/src/androidTest/AndroidManifest.xml
index 11e4107..784abb9 100644
--- a/compose/ui/ui-graphics/benchmark/test/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-graphics/benchmark/test/src/androidTest/AndroidManifest.xml
@@ -14,7 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.compose.ui.graphics.benchmark.test">
-</manifest>
+<manifest package="androidx.compose.ui.graphics.benchmark.test"/>
diff --git a/compose/ui/ui-text/benchmark/src/androidTest/AndroidManifest.xml b/compose/ui/ui-text/benchmark/src/androidTest/AndroidManifest.xml
index 7529fea..e342247 100644
--- a/compose/ui/ui-text/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui-text/benchmark/src/androidTest/AndroidManifest.xml
@@ -15,17 +15,9 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.ui.text.benchmark">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/ui/ui/benchmark/src/androidTest/AndroidManifest.xml b/compose/ui/ui/benchmark/src/androidTest/AndroidManifest.xml
index 0113871a..d7acb11 100644
--- a/compose/ui/ui/benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/ui/ui/benchmark/src/androidTest/AndroidManifest.xml
@@ -15,18 +15,11 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.compose.ui.benchmark">
-
- <!--
- ~ Important: disable debuggable for accurate performance results
- -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
+
<activity android:name="androidx.compose.ui.benchmark.input.pointer.TestActivity" />
</application>
</manifest>
diff --git a/emoji2/emoji2-benchmark/src/androidTest/AndroidManifest.xml b/emoji2/emoji2-benchmark/src/androidTest/AndroidManifest.xml
index 07b3c28..5a4a164 100644
--- a/emoji2/emoji2-benchmark/src/androidTest/AndroidManifest.xml
+++ b/emoji2/emoji2-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.emoji2.benchmark">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/emoji2/integration-tests/init-disabled-macrobenchmark-target/src/main/AndroidManifest.xml b/emoji2/integration-tests/init-disabled-macrobenchmark-target/src/main/AndroidManifest.xml
index cffda4d..09a6be3 100644
--- a/emoji2/integration-tests/init-disabled-macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/emoji2/integration-tests/init-disabled-macrobenchmark-target/src/main/AndroidManifest.xml
@@ -26,7 +26,6 @@
tools:ignore="MissingApplicationIcon">
<!-- Profileable to enable macrobenchmark profiling -->
- <!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
<!--
diff --git a/emoji2/integration-tests/init-enabled-macrobenchmark-target/src/main/AndroidManifest.xml b/emoji2/integration-tests/init-enabled-macrobenchmark-target/src/main/AndroidManifest.xml
index eff5f4c..2dfe314 100644
--- a/emoji2/integration-tests/init-enabled-macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/emoji2/integration-tests/init-enabled-macrobenchmark-target/src/main/AndroidManifest.xml
@@ -26,7 +26,6 @@
tools:ignore="MissingApplicationIcon">
<!-- Profileable to enable macrobenchmark profiling -->
- <!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
<!--
diff --git a/navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml b/navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml
index 358a851..b16e9d9 100644
--- a/navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml
+++ b/navigation/navigation-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.navigation.benchmark.test">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/profileinstaller/integration-tests/init-macrobenchmark-target/src/main/AndroidManifest.xml b/profileinstaller/integration-tests/init-macrobenchmark-target/src/main/AndroidManifest.xml
index f2fbc15..7e904e6 100644
--- a/profileinstaller/integration-tests/init-macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/profileinstaller/integration-tests/init-macrobenchmark-target/src/main/AndroidManifest.xml
@@ -25,7 +25,6 @@
tools:ignore="MissingApplicationIcon">
<!-- Profileable to enable macrobenchmark profiling -->
- <!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
<!--
diff --git a/profileinstaller/profileinstaller-benchmark/src/androidTest/AndroidManifest.xml b/profileinstaller/profileinstaller-benchmark/src/androidTest/AndroidManifest.xml
index 249b21d..604941e 100644
--- a/profileinstaller/profileinstaller-benchmark/src/androidTest/AndroidManifest.xml
+++ b/profileinstaller/profileinstaller-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.profileinstaller.benchmark">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml b/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
index 8653650..d79a491 100644
--- a/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
+++ b/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,16 +16,11 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.recyclerview.benchmark">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
+
<activity
android:name=".RecyclerViewActivity"
android:theme="@style/BenchmarkTheme"/>
diff --git a/room/benchmark/src/androidTest/AndroidManifest.xml b/room/benchmark/src/androidTest/AndroidManifest.xml
index 23bc3af..42ea1a8 100644
--- a/room/benchmark/src/androidTest/AndroidManifest.xml
+++ b/room/benchmark/src/androidTest/AndroidManifest.xml
@@ -16,15 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.room.benchmark">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/slice/slice-benchmark/src/androidTest/AndroidManifest.xml b/slice/slice-benchmark/src/androidTest/AndroidManifest.xml
index 570a690..ff574dd 100644
--- a/slice/slice-benchmark/src/androidTest/AndroidManifest.xml
+++ b/slice/slice-benchmark/src/androidTest/AndroidManifest.xml
@@ -16,14 +16,9 @@
-->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.slice.benchmark.test">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
diff --git a/wear/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/wear/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index 0aaac14..e662e8c 100644
--- a/wear/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/wear/benchmark/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
@@ -28,7 +28,6 @@
tools:ignore="MissingApplicationIcon">
<!-- Profileable to enable macrobenchmark profiling -->
- <!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
<!--
diff --git a/wear/compose/compose-material/benchmark/src/androidTest/AndroidManifest.xml b/wear/compose/compose-material/benchmark/src/androidTest/AndroidManifest.xml
index aa65e87..2615d48 100644
--- a/wear/compose/compose-material/benchmark/src/androidTest/AndroidManifest.xml
+++ b/wear/compose/compose-material/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,19 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="androidx.wear.compose.material.benchmark">
-
- <!--
- Important: disable debugging for accurate performance results
-
- In a com.android.library project, this flag must be disabled from this
- manifest, as it is not possible to override this flag from Gradle.
- -->
- <application
- android:debuggable="false"
- tools:ignore="HardcodedDebugMode"
- tools:replace="android:debuggable" />
-</manifest>
\ No newline at end of file
+<manifest package="androidx.wear.compose.material.benchmark"/>
\ No newline at end of file
diff --git a/wear/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml b/wear/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
index 3c45bb0..7f488b1 100644
--- a/wear/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
+++ b/wear/compose/integration-tests/macrobenchmark-target/src/main/AndroidManifest.xml
@@ -28,7 +28,6 @@
tools:ignore="MissingApplicationIcon">
<!-- Profileable to enable macrobenchmark profiling -->
- <!--suppress AndroidElementNotAllowed -->
<profileable android:shell="true"/>
<!--
diff --git a/work/work-benchmark/src/androidTest/AndroidManifest.xml b/work/work-benchmark/src/androidTest/AndroidManifest.xml
index f48b579..f07f839 100644
--- a/work/work-benchmark/src/androidTest/AndroidManifest.xml
+++ b/work/work-benchmark/src/androidTest/AndroidManifest.xml
@@ -15,15 +15,9 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="androidx.work.benchmark.test">
-
- <!-- Important: disable debuggable for accurate performance results -->
- <application
- android:debuggable="false"
- tools:replace="android:debuggable">
- <!-- enable profileableByShell for non-intrusive profiling tools -->
- <!--suppress AndroidElementNotAllowed -->
+ <application>
+ <!-- enable profiling by shell for non-intrusive profiling tools -->
<profileable android:shell="true"/>
</application>
</manifest>
