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

Unified Diff: ui/resources/ui_resources.gyp

Issue 693493003: Revert "Move network_connect code to ui/chromeos/network" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/resources/BUILD.gn ('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 10eb97db2241a9503a5f28ed3192966e29c126db..69de7e5997693eab071c4e73d434a5d0456f18a4 100644
--- a/ui/resources/ui_resources.gyp
+++ b/ui/resources/ui_resources.gyp
@@ -58,25 +58,11 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
],
'pak_output': '<(PRODUCT_DIR)/ui_test.pak',
- 'conditions': [
- ['chromeos==1', {
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',
- ],
- }],
- ],
},
'includes': [ '../../build/repack_action.gypi' ],
},
],
'conditions': [
- ['chromeos==1', {
- 'dependencies': [
- '../chromeos/ui_chromeos.gyp:ui_chromeos_strings',
- '../chromeos/ui_chromeos.gyp:ui_chromeos_resources',
- ],
- }],
['OS != "mac"', {
'copies': [
{
« no previous file with comments | « ui/resources/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698