Skip to content

Commit

Permalink
Reland "Merges process and package resources script"
Browse files Browse the repository at this point in the history
This reverts commit 52affce.

Reason for reland: Fixes bug that causes webview to fail

Original change's description:
> Revert "Merges process and package resources script"
>
> This reverts commit ea0f96c.
>
> Reason for revert:
> Causing resource errors in the real webview (not on cq)
> https://build.chromium.org/p/chromium.android/builders/Android%20WebView%20L%20%28dbg%29/builds/10729
>
> Original change's description:
> > Merges process and package resources script
> >
> > process_resources.py and package_resources.py are currently both required to
> > create the final apk. They currently communicate using zipfiles. This ends up
> > having 3-4 zips/unzips during the final build of the same apk in order to
> > perform modifications. This merger allows all the required processing to be
> > done before apk creation with no need for zipping. It also simplifies the
> > process_resources.py script to separate the code that runs during library
> > builds vs apk builds.
> >
> > Bug: 782316
> > Change-Id: I958c1d107d593b0932275d3c4452c2c51c499b55
> > Reviewed-on: https://chromium-review.googlesource.com/791152
> > Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
> > Reviewed-by: agrieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#519850}
>
> TBR=agrieve@chromium.org,mheikal@chromium.org
>
> Change-Id: If0d30f7e57b18ff56bd17c2c918398158fb3dffa
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 782316
> Reviewed-on: https://chromium-review.googlesource.com/796717
> Reviewed-by: Bo <boliu@chromium.org>
> Commit-Queue: Bo <boliu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#520149}

Bug: 782316
Change-Id: I4b6d7650c84706b55bfab7ae6943251342f2e0b3
Reviewed-on: https://chromium-review.googlesource.com/801595
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520961}
  • Loading branch information
m0hamed authored and Commit Bot committed Dec 1, 2017
1 parent 0a6d1ba commit 46a41a8
Show file tree
Hide file tree
Showing 5 changed files with 506 additions and 793 deletions.
2 changes: 1 addition & 1 deletion base/android/java/src/org/chromium/base/LocaleUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private LocaleUtils() {

static {
// A variation of this mapping also exists in:
// build/android/gyp/package_resources.py
// build/android/gyp/process_resources.py
HashMap<String, String> mapForChromium = new HashMap<>();
mapForChromium.put("iw", "he"); // Hebrew
mapForChromium.put("ji", "yi"); // Yiddish
Expand Down
Loading

0 comments on commit 46a41a8

Please sign in to comment.