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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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
« android_webview/browser/aw_browser_main_parts.cc ('K') | « 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..ba99decd8ecc54b7cbac8518649de7259d624878 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1408,6 +1408,10 @@ repack("packed_extra_resources") {
"//net:net_resources",
"//ui/resources",
]
+ if (is_android) {
jbudorick 2016/08/10 14:44:07 nit: blank line before this if block, no blank lin
aberent 2016/08/10 16:04:20 Done.
+ sources += [ "$root_gen_dir/android_webview/aw_resources.pak" ]
+ deps += [ "//android_webview:generate_aw_resources" ]
+ }
if (!is_ios && !is_android) {
# New paks should be added here by default.
« android_webview/browser/aw_browser_main_parts.cc ('K') | « 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