|
Revert 216822 "Remove chrome.pak references, build resources int..."
Broke a variety of Linux, CrOS, and Android bots:
ninja: error: 'gen/repack/chrome.pak', needed by 'chrome.pak', missing and no
known rule to make it
> Remove chrome.pak references, build resources into resources.pak
>
> This puts resources that used to be in chrome.pak and/or compiled in to
> chrome.dll into resources.pak. resources.pak is already loaded at startup
> on all platforms so having some resources in a separate pak file isn't
> beneficial.
>
> R=tony
> TBR=sky
>
> BUG= 52609
>
> Review URL: https://chromiumcodereview.appspot.com/22339020
TBR=jamesr@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216823
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+47 lines, -17 lines) |
Patch |
 |
M |
trunk/src/ash/ash.gyp
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/app/chrome_main_delegate.cc
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/chrome_content_browser_client.cc
|
View
|
|
1 chunk |
+8 lines, -2 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser_tests.isolate
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/chrome.isolate
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/chrome_android_paks.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/chrome_dll_bundle.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/chrome_installer.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/chrome_ios_bundle_resources.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/chrome_repack_chrome.gypi
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/chrome_repack_resources.gypi
|
View
|
|
2 chunks |
+3 lines, -15 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/chrome_resources.gyp
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/common/descriptors_android.h
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/interactive_ui_tests.isolate
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/sync_integration_tests.isolate
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/tools/build/chromeos/FILES.cfg
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/tools/build/linux/FILES.cfg
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/unit_tests.isolate
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/ui/base/resource/resource_bundle_android.cc
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/ui/base/resource/resource_bundle_auralinux.cc
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/ui/base/resource/resource_bundle_gtk.cc
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/ui/base/resource/resource_bundle_mac.mm
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
trunk/src/ui/ui_unittests.isolate
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|