Remove now-obsolete separate release manifests.

PiperOrigin-RevId: 577220177
android · Oct 27, 2023 · 389960b · 389960b
1 parent e44b678
commit 389960b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 70 deletions.
diff --git a/core/java/androidx/test/core/AndroidManifest.xml b/core/java/androidx/test/core/AndroidManifest.xml
@@ -17,9 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.test.core" >
 
-    <!-- TODO(299123220): bump to minSdk 19 once dependent tests have been fixed -->
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="28" />
 
     <uses-permission android:name="android.permission.REORDER_TASKS" />

diff --git a/core/java/androidx/test/core/AndroidManifest_release.xml b/core/java/androidx/test/core/AndroidManifest_release.xml
diff --git a/core/java/androidx/test/core/BUILD b/core/java/androidx/test/core/BUILD
@@ -74,7 +74,7 @@ android_library(
 android_library(
     name = "core_aar_lib",
     testonly = 1,
-    manifest = "AndroidManifest_release.xml",
+    manifest = "AndroidManifest.xml",
     resource_files = glob(["res/**"]),
     visibility = ["//visibility:private"],
     exports = [

diff --git a/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml b/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
@@ -18,9 +18,8 @@
     package="androidx.test.ext.junit" >
 
 
-    <!-- TODO(299123220): bump to minSdk 19 once dependent tests have been fixed -->
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="19"
         android:targetSdkVersion="33" />
 
 </manifest>
diff --git a/ext/junit/java/androidx/test/ext/junit/AndroidManifest_release.xml b/ext/junit/java/androidx/test/ext/junit/AndroidManifest_release.xml
diff --git a/ext/junit/java/androidx/test/ext/junit/BUILD b/ext/junit/java/androidx/test/ext/junit/BUILD
@@ -42,7 +42,7 @@ android_library(
     testonly = 1,
     custom_package = "androidx.test.ext.junit",
     exports_manifest = 1,
-    manifest = "AndroidManifest_release.xml",
+    manifest = "AndroidManifest.xml",
     visibility = ["//visibility:private"],
     exports = [":junit"],
     deps = [":junit"],