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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/harfbuzz-ng/harfbuzz.gyp

Issue 13732002: Linux: move use_system_harfbuzz logic out of the main file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: README Created 7 years, 8 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
« build/linux/unbundle/README ('K') | « build/linux/unbundle/replace_gyp_files.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/harfbuzz-ng/harfbuzz.gyp
diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp
index 59ca045d5fcbf7fdb3c4d0ae23604093930844b4..da7bc2f6f43a68a5b364efd9109a891e840c1f22 100644
--- a/third_party/harfbuzz-ng/harfbuzz.gyp
+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
@@ -3,155 +3,125 @@
# found in the LICENSE file.
{
- 'variables': {
- 'use_system_harfbuzz%': 0,
- },
'includes': [
'../../build/win_precompile.gypi',
],
- 'conditions': [
- ['use_system_harfbuzz==0', {
- 'targets': [
- {
- 'target_name': 'harfbuzz-ng',
- 'type': 'static_library',
- 'defines': [
- 'HAVE_OT',
- 'HAVE_ICU',
- 'HB_NO_MT',
- ],
- 'sources': [
- 'src/hb-atomic-private.hh',
- 'src/hb-blob.cc',
- 'src/hb-blob.h',
- 'src/hb-buffer-deserialize-json.hh',
- 'src/hb-buffer-deserialize-text.hh',
- 'src/hb-buffer-private.hh',
- 'src/hb-buffer-serialize.cc',
- 'src/hb-buffer.cc',
- 'src/hb-buffer.h',
- 'src/hb-cache-private.hh',
- 'src/hb-common.cc',
- 'src/hb-common.h',
- 'src/hb-fallback-shape.cc',
- 'src/hb-font-private.hh',
- 'src/hb-font.cc',
- 'src/hb-font.h',
- 'src/hb-icu.cc',
- 'src/hb-icu.h',
- 'src/hb-mutex-private.hh',
- 'src/hb-object-private.hh',
- 'src/hb-open-file-private.hh',
- 'src/hb-open-type-private.hh',
- 'src/hb-ot-head-table.hh',
- 'src/hb-ot-hhea-table.hh',
- 'src/hb-ot-hmtx-table.hh',
- 'src/hb-ot-layout-common-private.hh',
- 'src/hb-ot-layout-gdef-table.hh',
- 'src/hb-ot-layout-gpos-table.hh',
- 'src/hb-ot-layout-gsub-table.hh',
- 'src/hb-ot-layout-gsubgpos-private.hh',
- 'src/hb-ot-layout-private.hh',
- 'src/hb-ot-layout.cc',
- 'src/hb-ot-layout.h',
- 'src/hb-ot-map-private.hh',
- 'src/hb-ot-map.cc',
- 'src/hb-ot-maxp-table.hh',
- 'src/hb-ot-name-table.hh',
- 'src/hb-ot-shape-complex-arabic-fallback.hh',
- 'src/hb-ot-shape-complex-arabic-table.hh',
- 'src/hb-ot-shape-complex-arabic.cc',
- 'src/hb-ot-shape-complex-default.cc',
- 'src/hb-ot-shape-complex-indic-machine.hh',
- 'src/hb-ot-shape-complex-indic-private.hh',
- 'src/hb-ot-shape-complex-indic-table.cc',
- 'src/hb-ot-shape-complex-indic-table.hh',
- 'src/hb-ot-shape-complex-indic.cc',
- 'src/hb-ot-shape-complex-myanmar-machine.hh',
- 'src/hb-ot-shape-complex-myanmar.cc',
- 'src/hb-ot-shape-complex-private.hh',
- 'src/hb-ot-shape-complex-sea-machine.hh',
- 'src/hb-ot-shape-complex-sea.cc',
- 'src/hb-ot-shape-complex-thai.cc',
- 'src/hb-ot-shape-fallback-private.hh',
- 'src/hb-ot-shape-fallback.cc',
- 'src/hb-ot-shape-normalize-private.hh',
- 'src/hb-ot-shape-normalize.cc',
- 'src/hb-ot-shape-private.hh',
- 'src/hb-ot-shape.cc',
- 'src/hb-ot-tag.cc',
- 'src/hb-ot-tag.h',
- 'src/hb-ot.h',
- 'src/hb-private.hh',
- 'src/hb-set-private.hh',
- 'src/hb-set.cc',
- 'src/hb-set.h',
- 'src/hb-shape-plan-private.hh',
- 'src/hb-shape-plan.cc',
- 'src/hb-shape-plan.h',
- 'src/hb-shape.cc',
- 'src/hb-shape.h',
- 'src/hb-shaper-impl-private.hh',
- 'src/hb-shaper-list.hh',
- 'src/hb-shaper-private.hh',
- 'src/hb-shaper.cc',
- 'src/hb-tt-font.cc',
- 'src/hb-unicode-private.hh',
- 'src/hb-unicode.cc',
- 'src/hb-unicode.h',
- 'src/hb-utf-private.hh',
- 'src/hb-version.h',
- 'src/hb-warning.cc',
- 'src/hb.h',
- ],
- 'include_dirs': [
- 'src',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- 'src',
- ],
- },
- 'dependencies': [
- '../../third_party/icu/icu.gyp:icuuc',
- ],
- 'conditions': [
- ['clang==1', {
- 'xcode_settings': {
- 'WARNING_CFLAGS': [
- '-Wno-unused-value',
- ],
- },
- 'cflags': [
- '-Wno-unused-value',
- ]
- }],
- ],
- },
+ 'targets': [
+ {
+ 'target_name': 'harfbuzz-ng',
+ 'type': 'static_library',
+ 'defines': [
+ 'HAVE_OT',
+ 'HAVE_ICU',
+ 'HB_NO_MT',
],
- }, { # use_system_harfbuzz == 1
- 'targets': [
- {
- 'target_name': 'harfbuzz-ng',
- 'type': 'none',
- 'cflags': [
- '<!@(pkg-config --cflags harfbuzz)',
- ],
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(pkg-config --cflags harfbuzz)',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l harfbuzz)',
+ 'sources': [
+ 'src/hb-atomic-private.hh',
+ 'src/hb-blob.cc',
+ 'src/hb-blob.h',
+ 'src/hb-buffer-deserialize-json.hh',
+ 'src/hb-buffer-deserialize-text.hh',
+ 'src/hb-buffer-private.hh',
+ 'src/hb-buffer-serialize.cc',
+ 'src/hb-buffer.cc',
+ 'src/hb-buffer.h',
+ 'src/hb-cache-private.hh',
+ 'src/hb-common.cc',
+ 'src/hb-common.h',
+ 'src/hb-fallback-shape.cc',
+ 'src/hb-font-private.hh',
+ 'src/hb-font.cc',
+ 'src/hb-font.h',
+ 'src/hb-icu.cc',
+ 'src/hb-icu.h',
+ 'src/hb-mutex-private.hh',
+ 'src/hb-object-private.hh',
+ 'src/hb-open-file-private.hh',
+ 'src/hb-open-type-private.hh',
+ 'src/hb-ot-head-table.hh',
+ 'src/hb-ot-hhea-table.hh',
+ 'src/hb-ot-hmtx-table.hh',
+ 'src/hb-ot-layout-common-private.hh',
+ 'src/hb-ot-layout-gdef-table.hh',
+ 'src/hb-ot-layout-gpos-table.hh',
+ 'src/hb-ot-layout-gsub-table.hh',
+ 'src/hb-ot-layout-gsubgpos-private.hh',
+ 'src/hb-ot-layout-private.hh',
+ 'src/hb-ot-layout.cc',
+ 'src/hb-ot-layout.h',
+ 'src/hb-ot-map-private.hh',
+ 'src/hb-ot-map.cc',
+ 'src/hb-ot-maxp-table.hh',
+ 'src/hb-ot-name-table.hh',
+ 'src/hb-ot-shape-complex-arabic-fallback.hh',
+ 'src/hb-ot-shape-complex-arabic-table.hh',
+ 'src/hb-ot-shape-complex-arabic.cc',
+ 'src/hb-ot-shape-complex-default.cc',
+ 'src/hb-ot-shape-complex-indic-machine.hh',
+ 'src/hb-ot-shape-complex-indic-private.hh',
+ 'src/hb-ot-shape-complex-indic-table.cc',
+ 'src/hb-ot-shape-complex-indic-table.hh',
+ 'src/hb-ot-shape-complex-indic.cc',
+ 'src/hb-ot-shape-complex-myanmar-machine.hh',
+ 'src/hb-ot-shape-complex-myanmar.cc',
+ 'src/hb-ot-shape-complex-private.hh',
+ 'src/hb-ot-shape-complex-sea-machine.hh',
+ 'src/hb-ot-shape-complex-sea.cc',
+ 'src/hb-ot-shape-complex-thai.cc',
+ 'src/hb-ot-shape-fallback-private.hh',
+ 'src/hb-ot-shape-fallback.cc',
+ 'src/hb-ot-shape-normalize-private.hh',
+ 'src/hb-ot-shape-normalize.cc',
+ 'src/hb-ot-shape-private.hh',
+ 'src/hb-ot-shape.cc',
+ 'src/hb-ot-tag.cc',
+ 'src/hb-ot-tag.h',
+ 'src/hb-ot.h',
+ 'src/hb-private.hh',
+ 'src/hb-set-private.hh',
+ 'src/hb-set.cc',
+ 'src/hb-set.h',
+ 'src/hb-shape-plan-private.hh',
+ 'src/hb-shape-plan.cc',
+ 'src/hb-shape-plan.h',
+ 'src/hb-shape.cc',
+ 'src/hb-shape.h',
+ 'src/hb-shaper-impl-private.hh',
+ 'src/hb-shaper-list.hh',
+ 'src/hb-shaper-private.hh',
+ 'src/hb-shaper.cc',
+ 'src/hb-tt-font.cc',
+ 'src/hb-unicode-private.hh',
+ 'src/hb-unicode.cc',
+ 'src/hb-unicode.h',
+ 'src/hb-utf-private.hh',
+ 'src/hb-version.h',
+ 'src/hb-warning.cc',
+ 'src/hb.h',
+ ],
+ 'include_dirs': [
+ 'src',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ 'src',
+ ],
+ },
+ 'dependencies': [
+ '../../third_party/icu/icu.gyp:icuuc',
+ ],
+ 'conditions': [
+ ['clang==1', {
+ 'xcode_settings': {
+ 'WARNING_CFLAGS': [
+ '-Wno-unused-value',
],
},
- },
+ 'cflags': [
+ '-Wno-unused-value',
+ ]
+ }],
],
- }],
+ },
],
}
« build/linux/unbundle/README ('K') | « build/linux/unbundle/replace_gyp_files.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698