Skip to content

Commit

Permalink
Enable dist fusing for all feature modules. (reland x 2)
Browse files Browse the repository at this point in the history
This reverts commit 932dfd1.

Reason for revert: Dex fusing has been fixed in bundletool and
a new version has been rolled: crrev.com/c/1789178

Original change's description:
> Revert "Enable dist fusing for all feature modules. (reland)"
> 
> This reverts commit 78fac99.
> 
> Reason for revert: Breaking some internal builders. Will reland once they are no longer building these targets.
> 
> Original change's description:
> > Enable dist fusing for all feature modules. (reland)
> > 
> > Fixed: I have disabled building of the system image in next-* builds
> > so there should no longer be an issue. next-* builds can be re-enabled
> > when bundletool is updated.
> > 
> > This reverts commit 7c77403.
> > 
> > Original change's description:
> > > Revert "Enable dist fusing for all feature modules."
> > > 
> > > This reverts commit 27ca1df.
> > > 
> > > 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/+/1764159
> > > Reviewed-by: Alex Ilin <alexilin@chromium.org>
> > > Commit-Queue: Alex Ilin <alexilin@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#689454}
> > 
> > TBR=alexilin@chromium.org,tiborg@chromium.org,benmason@chromium.org
> > 
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> > 
> > Change-Id: Id4687e7980b238cdbea04a1c8921b57a974f7cd0
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1768946
> > Reviewed-by: Ben Mason <benmason@chromium.org>
> > Commit-Queue: Ben Mason <benmason@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#689947}
> 
> TBR=alexilin@chromium.org,tiborg@chromium.org,benmason@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Change-Id: Ib1558378a9b2a12b7f0260a04eeb1fbe4d1330b1
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1773836
> Reviewed-by: Ben Mason <benmason@chromium.org>
> Commit-Queue: Ben Mason <benmason@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#690995}

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

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I5f5e2aa67eebca73b2109116b4d1beba82755d55
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1789826
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694329}
  • Loading branch information
Ben Mason authored and Commit Bot committed Sep 6, 2019
1 parent 1dba52d commit e571ea5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion chrome/android/features/ar/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<dist:module
dist:onDemand="true"
dist:title="@string/ar_module_title">
<dist:fusing dist:include="false" />
<dist:fusing dist:include="true" />
</dist:module>

<application>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<dist:module
dist:onDemand="true"
dist:title="@string/autofill_assistant_module_title">
<dist:fusing dist:include="false" />
<dist:fusing dist:include="true" />
</dist:module>

<application>
Expand Down
2 changes: 1 addition & 1 deletion chrome/android/features/dev_ui/java/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<dist:module
dist:onDemand="true"
dist:title="@string/dev_ui_module_title">
<dist:fusing dist:include="false" />
<dist:fusing dist:include="true" />
</dist:module>

<application />
Expand Down
2 changes: 1 addition & 1 deletion chrome/android/features/tab_ui/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<dist:module
dist:onDemand="true"
dist:title="@string/tab_management_module_title">
<dist:fusing dist:include="false" />
<dist:fusing dist:include="true" />
</dist:module>
</manifest>

2 changes: 1 addition & 1 deletion chrome/android/features/vr/java/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<dist:module
dist:instant="false"
dist:title="@string/vr_module_title">
<dist:fusing dist:include="false" />
<dist:fusing dist:include="true" />
<dist:delivery>
<dist:install-time>
<dist:conditions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<dist:module
dist:onDemand="true"
dist:title="@string/test_dummy_module_title">
<dist:fusing dist:include="false" />
<dist:fusing dist:include="true" />
</dist:module>

<application />
</manifest>
</manifest>
8 changes: 4 additions & 4 deletions docs/android_dynamic_feature_modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ First, create the file
<dist:module
dist:onDemand="true"
dist:title="@string/foo_module_title">
<!-- This will prevent the module to become part of the Android K
build in case we ever want to use bundles on Android K. -->
<dist:fusing dist:include="false" />
<!-- This will fuse the module into the base APK if a system image
APK is built from this bundle. -->
<dist:fusing dist:include="true" />
</dist:module>

<!-- Remove android:hasCode="false" when adding Java code. -->
Expand Down Expand Up @@ -775,7 +775,7 @@ like this:
<dist:module
dist:instant="false"
dist:title="@string/foo_module_title">
<dist:fusing dist:include="false" />
<dist:fusing dist:include="true" />
<dist:delivery>
<dist:install-time>
<dist:conditions>
Expand Down

0 comments on commit e571ea5

Please sign in to comment.