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

Unified Diff: ppapi/ppapi_internal.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 | « net/net.gyp ('k') | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/ppapi_internal.gyp
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index 6d7563827404aa77a1a34148d9191c265fb3a346..fd82adc0dd47dc532fe38a153a8a00092ffe0f5a 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -52,14 +52,14 @@
'../gpu/gpu.gyp:gles2_implementation',
'../media/media.gyp:shared_memory_support',
'../skia/skia.gyp:skia',
- '../third_party/icu/icu.gyp:icuuc',
# TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '../third_party/icu/icu.gyp:icuuc',
'../ui/surface/surface.gyp:surface',
],
'export_dependent_settings': [
'../base/base.gyp:base',
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'conditions': [
['OS=="mac"', {
@@ -112,10 +112,10 @@
'../media/media.gyp:shared_memory_support',
'../ipc/ipc.gyp:ipc',
'../skia/skia.gyp:skia',
+ # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
- # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/surface/surface.gyp:surface',
'ppapi.gyp:ppapi_c',
'ppapi_shared',
@@ -151,10 +151,10 @@
'../media/media.gyp:shared_memory_support',
'../ipc/ipc.gyp:ipc',
'../skia/skia.gyp:skia',
+ # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/icu/icu.gyp:icui18n',
- # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/surface/surface.gyp:surface',
'ppapi.gyp:ppapi_c',
'ppapi_shared',
« no previous file with comments | « net/net.gyp ('k') | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698