Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: chrome/BUILD.gn

Issue 2235753002: Merge webviewchromium.pak and resources.pak in Monochrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: upstream monochrome asset build Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/aw_browser_main_parts.cc ('k') | ui/base/resource/resource_bundle_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index b56bbb863b3595548d3ca3b3f18bf6dc8881a84a..46696c09f97d01d088f0219e8e4eb4ec35a8efce 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1409,6 +1409,10 @@ repack("packed_extra_resources") {
"//ui/resources",
]
+ if (is_android) {
+ sources += [ "$root_gen_dir/android_webview/aw_resources.pak" ]
+ deps += [ "//android_webview:generate_aw_resources" ]
+ }
michaelbai 2016/08/22 22:29:37 Will this add aw_resources to standaline Chrome?
Torne 2016/08/26 13:56:36 I think so, actually, yes.. oops. Maybe you could
if (!is_ios && !is_android) {
# New paks should be added here by default.
sources += [
« no previous file with comments | « android_webview/browser/aw_browser_main_parts.cc ('k') | ui/base/resource/resource_bundle_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698