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

Unified Diff: gyp/utils.gyp

Issue 2070983002: Move headers in include/utils/win to src/utils/win. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Really rebase. Created 4 years, 6 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 | « no previous file | gyp/utils.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/utils.gyp
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 4cd71a7b6086d7eaa9569e0b242411d479013709..b6ce7fde1bc1e3db7bf2b4292c7d6a5fdc20ab69 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -25,13 +25,12 @@
'../include/private',
'../include/utils',
'../include/utils/mac',
- '../include/utils/unix',
- '../include/utils/win',
'../src/core',
'../src/gpu',
'../src/image',
'../src/opts',
'../src/utils',
+ '../src/utils/win',
],
'sources': [
'utils.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
@@ -59,16 +58,10 @@
'../src/utils/mac/SkCreateCGImageRef.cpp',
],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
- },{ #else if 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]'
- 'include_dirs!': [
- '../include/utils/unix',
- ],
- }],
[ 'skia_os == "win"', {
'direct_dependent_settings': {
'include_dirs': [
- '../include/utils/win',
+ '../src/utils/win',
],
},
'sources!': [
@@ -77,14 +70,11 @@
],
},{ #else if 'skia_os != "win"'
'include_dirs!': [
- '../include/utils/win',
+ '../src/utils/win',
],
'sources/': [ ['exclude', '_win.(h|cpp)$'],],
'sources!': [
- '../include/utils/win/SkAutoCoInitialize.h',
- '../include/utils/win/SkHRESULT.h',
- '../include/utils/win/SkIStream.h',
- '../include/utils/win/SkTScopedComPtr.h',
+ '../src/utils/win/SkAutoCoInitialize.h',
'../src/utils/win/SkAutoCoInitialize.cpp',
'../src/utils/win/SkDWrite.h',
'../src/utils/win/SkDWrite.cpp',
@@ -92,8 +82,11 @@
'../src/utils/win/SkDWriteFontFileStream.h',
'../src/utils/win/SkDWriteGeometrySink.cpp',
'../src/utils/win/SkDWriteGeometrySink.h',
+ '../src/utils/win/SkHRESULT.h',
'../src/utils/win/SkHRESULT.cpp',
+ '../src/utils/win/SkIStream.h',
'../src/utils/win/SkIStream.cpp',
+ '../src/utils/win/SkTScopedComPtr.h',
],
}],
],
« no previous file with comments | « no previous file | gyp/utils.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698