Remove duplicate unused test AndroidManifest.xml.

RELNOTES: None
PiperOrigin-RevId: 159580867

3 files changed, 4 insertions, 103 deletions

diff --git a/src/test/java/com/google/devtools/build/android/testing/manifestmerge/BUILD b/src/test/java/com/google/devtools/build/android/testing/manifestmerge/BUILD
index 3a79cf0443..d58f42049f 100644
--- a/src/test/java/com/google/devtools/build/android/testing/manifestmerge/BUILD
+++ b/src/test/java/com/google/devtools/build/android/testing/manifestmerge/BUILD
@@ -3,7 +3,7 @@ package(default_visibility = ["//src/test/java/com/google/devtools/build/android
 filegroup(
     name = "test_data",
     srcs = [
-        "expected/BazelAndroidManifest.xml",
+        "expected/AndroidManifest.xml",
         "mergeeOne/AndroidManifest.xml",
         "mergeeTwo/AndroidManifest.xml",
         "merger/AndroidManifest.xml",
diff --git a/src/test/java/com/google/devtools/build/android/testing/manifestmerge/expected/AndroidManifest.xml b/src/test/java/com/google/devtools/build/android/testing/manifestmerge/expected/AndroidManifest.xml
index 07778bb858..79a17dbb36 100644
--- a/src/test/java/com/google/devtools/build/android/testing/manifestmerge/expected/AndroidManifest.xml
+++ b/src/test/java/com/google/devtools/build/android/testing/manifestmerge/expected/AndroidManifest.xml
@@ -8,6 +8,9 @@
   <uses-feature android:name="android.hardware.nfc" android:required="true" />
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <permission android:name="com.google.android.apps.foo.C2D_MESSAGE" android:protectionLevel="signature" />
+  <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <android:uses-permission android:name="android.permission.READ_PHONE_STATE" />
+  <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <application
       android:name="com.google.android.apps.testapp.TestApplication"
       android:backupAgent="com.google.android.apps.testapp2.FooBar"
diff --git a/src/test/java/com/google/devtools/build/android/testing/manifestmerge/expected/BazelAndroidManifest.xml b/src/test/java/com/google/devtools/build/android/testing/manifestmerge/expected/BazelAndroidManifest.xml
deleted file mode 100644
index 79a17dbb36..0000000000
--- a/src/test/java/com/google/devtools/build/android/testing/manifestmerge/expected/BazelAndroidManifest.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.apps.testapp"
-    android:versionCode="70"
-    android:versionName="1.0" >
-  <uses-sdk android:minSdkVersion="10" />
-  <uses-feature android:name="android.hardware.nfc" android:required="true" />
-  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-  <permission android:name="com.google.android.apps.foo.C2D_MESSAGE" android:protectionLevel="signature" />
-  <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <android:uses-permission android:name="android.permission.READ_PHONE_STATE" />
-  <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-  <application
-      android:name="com.google.android.apps.testapp.TestApplication"
-      android:backupAgent="com.google.android.apps.testapp2.FooBar"
-      android:icon="@drawable/icon"
-      android:label="@string/app_name"
-      android:theme="@style/Theme.Test" >
-    <!--  START LIBRARIES (Maintain Alphabetic order) -->
-    <!-- NFC extras -->
-    <uses-library android:name="com.google.android.nfc_extras" android:required="false" />
-    <!--  END LIBRARIES -->
-    <!--  START ACTIVITIES (Maintain Alphabetic order) -->
-    <!-- Entry point activity - navigation and title bar. -->
-    <activity
-        android:name="com.google.android.apps.testapp.entrypoint.EntryPointActivityGroup"
-        android:launchMode="singleTop"
-        android:screenOrientation="portrait" />
-    <activity android:name="com.google.android.apps.testapp.ui.topup.TopUpActivity" />
-    <service android:name="com.google.android.apps.testapp.nfcevent.NfcEventService" />
-    <receiver
-         android:name="com.receiver.TestReceiver"
-         android:process="@string/receiver_service_name" >
-      <!-- Receive the actual message -->
-       <intent-filter>
-         <action
-           android:name="android.intent.action.USER_PRESENT" />
-       </intent-filter>
-    </receiver>
-    <provider
-      android:name="com.google.android.apps.testapp.dataaccess.persistence.ContentProvider"
-      android:authorities="com.google.android.apps.testapp"
-      android:exported="false" />
-    <activity android:name="com.google.android.apps.testapp2.ui.home.HomeActivity" android:label="@string/app_name" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-    <activity android:name="com.google.android.apps.testapp2.TestActivity2" />
-    <activity android:name="com.google.android.apps.testapp2.PreviewActivity" />
-    <activity android:name="com.google.android.apps.testapp2.ShowTextActivity"
-        android:excludeFromRecents="true" />
-    <activity android:name="com.google.android.apps.testapp2.ShowStringListActivity"
-              android:excludeFromRecents="true"
-              android:parentActivityName="com.google.android.apps.testapp2.ui.home.HomeActivity" >
-    </activity>
-    <service android:name="com.google.android.apps.testapp2.TestService" >
-      <meta-data android:name="param" android:value="value" />
-    </service>
-    <service android:name="com.google.android.apps.testapp2.nfcevent.NfcEventService" />
-    <receiver android:name="com.google.android.apps.testapp2.ConnectivityReceiver"
-        android:enabled="false" >
-      <intent-filter>
-        <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-      </intent-filter>
-    </receiver>
-    <activity-alias android:name="com.google.android.apps.testapp2.BarFoo"
-      android:targetActivity="com.google.android.apps.testapp2.FooBar" />
-    <provider
-      android:name="some.package.with.inner.class$AnInnerClass" />
-    <provider
-      android:name="com.google.android.apps.testapp"
-      android:authorities="com.google.android.apps.testapp.com.google.android.apps.testapp"
-      android:exported="false" />
-    <provider
-      android:name="com.google.android.apps.testapp.PlaceHolderProviderName"
-      android:authorities="PlaceHolderProviderAuthorities.com.google.android.apps.testapp"
-      android:exported="false" />
-    <activity
-      android:name="activityPrefix.com.google.android.apps.testapp.activitySuffix" >
-      <intent-filter>
-        <action android:name="actionPrefix.com.google.android.apps.testapp.actionSuffix" />
-      </intent-filter>
-    </activity>
-    <activity android:name="com.google.android.apps.testapp3.ui.home.HomeActivity" android:label="@string/app_name" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-    <activity android:name="com.google.android.apps.testapp3.TestActivity" />
-    <service android:name="com.google.android.apps.testapp3.TestService" />
-    <receiver android:name="com.google.android.apps.testapp3.ConnectivityReceiver"
-              android:enabled="true" >
-      <intent-filter>
-        <action android:name="android.net.conn.CONNECTIVITY_CHANGER" />
-      </intent-filter>
-    </receiver>
-  </application>
-</manifest>