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

Unified Diff: ui/ui.gyp

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyps, fix ios Created 7 years, 7 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 | « skia/skia.gyp ('k') | webkit/base/webkit_base.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 9169e089eff0b90b952425b0830ae3c9f048a900..789c6536f642da67b318ae899cb2899e2fa0115b 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -9,6 +9,7 @@
'includes': [
'shell_dialogs.gypi',
'ui_resources.gypi',
+ 'ui_unittests.gypi',
],
'targets': [
{
@@ -878,11 +879,6 @@
'-ldl',
],
}],
- ['inside_chromium_build==0', {
- 'dependencies': [
- '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
- ],
- }],
['use_system_icu==1', {
# When using the system icu, the icu targets generate shim headers
# which are included by public headers in the ui target, so we need
@@ -893,11 +889,6 @@
},
],
'conditions': [
- ['inside_chromium_build == 1', {
- 'includes': [
- 'ui_unittests.gypi',
- ]},
- ],
['OS=="android"' , {
'targets': [
{
« no previous file with comments | « skia/skia.gyp ('k') | webkit/base/webkit_base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698