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

Unified Diff: ui/resources/ui_resources.gyp

Issue 588963002: Start the process of renaming ui_unittests to ui_base_unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix clobber build of ui_unittests on Android - crbug.com/374490 Created 6 years, 3 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 | « ui/base/ui_base_tests.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/resources/ui_resources.gyp
diff --git a/ui/resources/ui_resources.gyp b/ui/resources/ui_resources.gyp
index 69de7e5997693eab071c4e73d434a5d0456f18a4..14a06162cf86934f5f6bff548f9079aaf1e02f15 100644
--- a/ui/resources/ui_resources.gyp
+++ b/ui/resources/ui_resources.gyp
@@ -115,6 +115,26 @@
},
],
}],
+ ['OS == "android"', {
+ 'actions': [
+ {
+ 'action_name': 'copy_en_US_pak',
+ 'message': 'Copying en-US.pak into locales/',
+ 'inputs': [
+ '<(PRODUCT_DIR)/ui/en-US.pak',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/locales/en-US.pak',
tfarina 2014/09/22 02:34:55 I'm hoping this will address -> crbug.com/374490.
tony 2014/09/22 16:20:50 Won't this get clobbered by the en-US.pak that is
tfarina 2014/09/22 17:17:15 Tony, Chris, could this being caused by https://co
+ ],
tfarina 2014/09/22 03:20:07 It seems to have fixed it: http://build.chromium.
+ 'action': [
+ 'python',
+ '../../build/cp.py',
+ '<@(_inputs)',
+ '<@(_outputs)'
+ ],
+ },
+ ],
+ }],
],
},
],
« no previous file with comments | « ui/base/ui_base_tests.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698