Commit 7c77403d authored by Alex Ilin's avatar Alex Ilin Committed by Commit Bot

Revert "Enable dist fusing for all feature modules."

This reverts commit 27ca1df7.

Reason for revert: This CL causes an official build failure
https://crbug.com/996658

Original change's description:
> Enable dist fusing for all feature modules.
> 
> Change-Id: I66848fec159450a6d531e0af3f867988aa8b148f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1763431
> Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
> Commit-Queue: Ben Mason <benmason@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#689075}

TBR=tiborg@chromium.org,benmason@chromium.org

Change-Id: Ib696df42847a54c1257fae41ecb544df40f47e75
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764159Reviewed-by: default avatarAlex Ilin <alexilin@chromium.org>
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689454}
parent c9bcba93
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<dist:module <dist:module
dist:onDemand="true" dist:onDemand="true"
dist:title="@string/ar_module_title"> dist:title="@string/ar_module_title">
<dist:fusing dist:include="true" /> <dist:fusing dist:include="false" />
</dist:module> </dist:module>
<application> <application>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<dist:module <dist:module
dist:onDemand="true" dist:onDemand="true"
dist:title="@string/autofill_assistant_module_title"> dist:title="@string/autofill_assistant_module_title">
<dist:fusing dist:include="true" /> <dist:fusing dist:include="false" />
</dist:module> </dist:module>
<application> <application>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<dist:module <dist:module
dist:onDemand="true" dist:onDemand="true"
dist:title="@string/dev_ui_module_title"> dist:title="@string/dev_ui_module_title">
<dist:fusing dist:include="true" /> <dist:fusing dist:include="false" />
</dist:module> </dist:module>
<application></application> <application></application>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dist:module <dist:module
dist:onDemand="true" dist:onDemand="true"
dist:title="@string/tab_management_module_title"> dist:title="@string/tab_management_module_title">
<dist:fusing dist:include="true" /> <dist:fusing dist:include="false" />
</dist:module> </dist:module>
</manifest> </manifest>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<dist:module <dist:module
dist:instant="false" dist:instant="false"
dist:title="@string/vr_module_title"> dist:title="@string/vr_module_title">
<dist:fusing dist:include="true" /> <dist:fusing dist:include="false" />
<dist:delivery> <dist:delivery>
<dist:install-time> <dist:install-time>
<dist:conditions> <dist:conditions>
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<dist:module <dist:module
dist:onDemand="true" dist:onDemand="true"
dist:title="@string/test_dummy_module_title"> dist:title="@string/test_dummy_module_title">
<dist:fusing dist:include="true" /> <dist:fusing dist:include="false" />
</dist:module> </dist:module>
<application /> <application />
</manifest> </manifest>
\ No newline at end of file
...@@ -51,9 +51,9 @@ First, create the file ...@@ -51,9 +51,9 @@ First, create the file
<dist:module <dist:module
dist:onDemand="true" dist:onDemand="true"
dist:title="@string/foo_module_title"> dist:title="@string/foo_module_title">
<!-- This will fuse the module into the base APK if a system image <!-- This will prevent the module to become part of the Android K
APK is built from this bundle. --> build in case we ever want to use bundles on Android K. -->
<dist:fusing dist:include="true" /> <dist:fusing dist:include="false" />
</dist:module> </dist:module>
<!-- Remove android:hasCode="false" when adding Java code. --> <!-- Remove android:hasCode="false" when adding Java code. -->
...@@ -758,7 +758,7 @@ like this: ...@@ -758,7 +758,7 @@ like this:
<dist:module <dist:module
dist:instant="false" dist:instant="false"
dist:title="@string/foo_module_title"> dist:title="@string/foo_module_title">
<dist:fusing dist:include="true" /> <dist:fusing dist:include="false" />
<dist:delivery> <dist:delivery>
<dist:install-time> <dist:install-time>
<dist:conditions> <dist:conditions>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment