Fix dynamic feature manifests
activity elements must be direct children of the application element.
Bug: 178810169
Test: existing
Change-Id: I886b1a22dcda1fb5eaa0fdf63f8f2035f61869a5
diff --git a/integration-tests-support/DynamicApp/featureA/src/main/AndroidManifest.xml b/integration-tests-support/DynamicApp/featureA/src/main/AndroidManifest.xml
index de613f2..f9ba119 100644
--- a/integration-tests-support/DynamicApp/featureA/src/main/AndroidManifest.xml
+++ b/integration-tests-support/DynamicApp/featureA/src/main/AndroidManifest.xml
@@ -26,6 +26,9 @@
<dist:on-demand />
</dist:delivery>
<dist:fusing dist:include="true" />
+ </dist:module>
+
+ <application>
<activity android:name=".FeatureAActivity">
<intent-filter android:order="1">
<action android:name="android.intent.action.VIEW"/>
@@ -44,6 +47,6 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- </dist:module>
+ </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/integration-tests-support/DynamicApp/featureB/src/main/AndroidManifest.xml b/integration-tests-support/DynamicApp/featureB/src/main/AndroidManifest.xml
index ffa45ab..0437289 100644
--- a/integration-tests-support/DynamicApp/featureB/src/main/AndroidManifest.xml
+++ b/integration-tests-support/DynamicApp/featureB/src/main/AndroidManifest.xml
@@ -26,6 +26,9 @@
<dist:on-demand />
</dist:delivery>
<dist:fusing dist:include="true" />
+ </dist:module>
+
+ <application>
<activity android:name=".MainBActivity">
<intent-filter android:order="1">
<action android:name="android.intent.action.VIEW"/>
@@ -44,6 +47,6 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- </dist:module>
+ </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/integration-tests/DynamicApp/featureA/src/main/AndroidManifest.xml b/integration-tests/DynamicApp/featureA/src/main/AndroidManifest.xml
index de613f2..f9ba119 100644
--- a/integration-tests/DynamicApp/featureA/src/main/AndroidManifest.xml
+++ b/integration-tests/DynamicApp/featureA/src/main/AndroidManifest.xml
@@ -26,6 +26,9 @@
<dist:on-demand />
</dist:delivery>
<dist:fusing dist:include="true" />
+ </dist:module>
+
+ <application>
<activity android:name=".FeatureAActivity">
<intent-filter android:order="1">
<action android:name="android.intent.action.VIEW"/>
@@ -44,6 +47,6 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- </dist:module>
+ </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/integration-tests/DynamicApp/featureB/src/main/AndroidManifest.xml b/integration-tests/DynamicApp/featureB/src/main/AndroidManifest.xml
index ffa45ab..0437289 100644
--- a/integration-tests/DynamicApp/featureB/src/main/AndroidManifest.xml
+++ b/integration-tests/DynamicApp/featureB/src/main/AndroidManifest.xml
@@ -26,6 +26,9 @@
<dist:on-demand />
</dist:delivery>
<dist:fusing dist:include="true" />
+ </dist:module>
+
+ <application>
<activity android:name=".MainBActivity">
<intent-filter android:order="1">
<action android:name="android.intent.action.VIEW"/>
@@ -44,6 +47,6 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- </dist:module>
+ </application>
-</manifest>
\ No newline at end of file
+</manifest>
