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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 211473008: Revert of Use the system provided harfbuzz on chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « build/common.gypi ('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 07b3a95d9732f16c29dd6b3bb247234464bf779c..ec2b12a270ba1b0b433ba6d12d346d1b40b6d126 100644
--- a/third_party/harfbuzz-ng/harfbuzz.gyp
+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
@@ -6,205 +6,142 @@
'includes': [
'../../build/win_precompile.gypi',
],
- 'variables': {
- 'variables': {
+ 'targets': [
+ {
+ 'target_name': 'harfbuzz-ng',
+ 'type': 'static_library',
+ 'defines': [
+ 'HAVE_OT',
+ 'HAVE_ICU',
+ 'HAVE_ICU_BUILTIN',
+ 'HB_NO_MT',
+ ],
+ 'sources': [
+ 'src/hb-atomic-private.hh',
+ 'src/hb-blob.cc',
+ 'src/hb-blob.h',
+ 'src/hb-buffer.cc',
+ 'src/hb-buffer-deserialize-json.hh',
+ 'src/hb-buffer-deserialize-text.hh',
+ 'src/hb-buffer.h',
+ 'src/hb-buffer-private.hh',
+ 'src/hb-buffer-serialize.cc',
+ 'src/hb-cache-private.hh',
+ 'src/hb-common.cc',
+ 'src/hb-common.h',
+ 'src/hb-deprecated.h',
+ 'src/hb-face.cc',
+ 'src/hb-face.h',
+ 'src/hb-face-private.hh',
+ 'src/hb-fallback-shape.cc',
+ 'src/hb-font.cc',
+ 'src/hb-font.h',
+ 'src/hb-font-private.hh',
+ 'src/hb.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.h',
+ 'src/hb-ot-head-table.hh',
+ 'src/hb-ot-hhea-table.hh',
+ 'src/hb-ot-hmtx-table.hh',
+ 'src/hb-ot-layout.cc',
+ '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-gsubgpos-private.hh',
+ 'src/hb-ot-layout-gsub-table.hh',
+ 'src/hb-ot-layout.h',
+ 'src/hb-ot-layout-private.hh',
+ 'src/hb-ot-map.cc',
+ 'src/hb-ot-map-private.hh',
+ 'src/hb-ot-maxp-table.hh',
+ 'src/hb-ot-name-table.hh',
+ 'src/hb-ot-shape.cc',
+ 'src/hb-ot-shape-complex-arabic.cc',
+ 'src/hb-ot-shape-complex-arabic-fallback.hh',
+ 'src/hb-ot-shape-complex-arabic-table.hh',
+ 'src/hb-ot-shape-complex-default.cc',
+ 'src/hb-ot-shape-complex-hangul.cc',
+ 'src/hb-ot-shape-complex-hebrew.cc',
+ 'src/hb-ot-shape-complex-indic.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-myanmar.cc',
+ 'src/hb-ot-shape-complex-myanmar-machine.hh',
+ 'src/hb-ot-shape-complex-private.hh',
+ 'src/hb-ot-shape-complex-sea.cc',
+ 'src/hb-ot-shape-complex-sea-machine.hh',
+ 'src/hb-ot-shape-complex-thai.cc',
+ 'src/hb-ot-shape-complex-tibetan.cc',
+ 'src/hb-ot-shape-fallback.cc',
+ 'src/hb-ot-shape-fallback-private.hh',
+ 'src/hb-ot-shape.h',
+ 'src/hb-ot-shape-normalize.cc',
+ 'src/hb-ot-shape-normalize-private.hh',
+ 'src/hb-ot-shape-private.hh',
+ 'src/hb-ot-tag.cc',
+ 'src/hb-ot-tag.h',
+ 'src/hb-private.hh',
+ 'src/hb-set.cc',
+ 'src/hb-set.h',
+ 'src/hb-set-private.hh',
+ 'src/hb-shape.cc',
+ 'src/hb-shape.h',
+ 'src/hb-shape-plan.cc',
+ 'src/hb-shape-plan.h',
+ 'src/hb-shape-plan-private.hh',
+ 'src/hb-shaper.cc',
+ 'src/hb-shaper-impl-private.hh',
+ 'src/hb-shaper-list.hh',
+ 'src/hb-shaper-private.hh',
+ 'src/hb-unicode.cc',
+ 'src/hb-unicode.h',
+ 'src/hb-unicode-private.hh',
+ 'src/hb-utf-private.hh',
+ 'src/hb-version.h',
+ 'src/hb-warning.cc',
+ ],
+ 'include_dirs': [
+ 'src',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ 'src',
+ ],
+ },
+ 'dependencies': [
+ '../../third_party/icu/icu.gyp:icuuc',
+ ],
'conditions': [
- ['sysroot!=""', {
- 'pkg-config': '<(chroot_cmd) ../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
- }, {
- 'pkg-config': 'pkg-config'
+ ['clang==1', {
+ 'xcode_settings': {
+ 'WARNING_CFLAGS': [
+ '-Wno-unused-value',
+ ],
+ },
+ 'cflags': [
+ '-Wno-unused-value',
+ ]
+ }],
+ ['OS=="win"', {
+ # TODO(eae): C4267 on amd64. size_t -> int, size_t -> unsigned int
+ 'msvs_disabled_warnings': [4267, 4334],
+ }],
+ ['OS=="mac"', {
+ 'defines': [
+ 'HAVE_CORETEXT',
+ ],
+ 'sources': [
+ 'src/hb-coretext.cc',
+ 'src/hb-coretext.h',
+ ],
}],
],
},
-
- 'pkg-config': '<(pkg-config)',
-
- 'conditions': [
- ['OS=="linux" and (buildtype!="Official" or chromeos==1)', {
- # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz
- # anyways. However, we want to have control of the version of harfbuzz
- # we use, so don't use system harfbuzz for official builds unless we're
- # building chromeos in which case we have the system harfbuzz under
- # control as well.
- 'use_system_harfbuzz': '<!(python ../../build/check_return_value.py <(pkg-config) --atleast-version=1.31.0 pangoft2)',
- }, {
- 'use_system_harfbuzz': 0,
- }],
- ],
- },
- 'conditions': [
- ['use_system_harfbuzz==0', {
- 'targets': [
- {
- 'target_name': 'harfbuzz-ng',
- 'type': 'static_library',
- 'defines': [
- 'HAVE_OT',
- 'HAVE_ICU',
- 'HAVE_ICU_BUILTIN',
- 'HB_NO_MT',
- ],
- 'sources': [
- 'src/hb-atomic-private.hh',
- 'src/hb-blob.cc',
- 'src/hb-blob.h',
- 'src/hb-buffer.cc',
- 'src/hb-buffer-deserialize-json.hh',
- 'src/hb-buffer-deserialize-text.hh',
- 'src/hb-buffer.h',
- 'src/hb-buffer-private.hh',
- 'src/hb-buffer-serialize.cc',
- 'src/hb-cache-private.hh',
- 'src/hb-common.cc',
- 'src/hb-common.h',
- 'src/hb-deprecated.h',
- 'src/hb-face.cc',
- 'src/hb-face.h',
- 'src/hb-face-private.hh',
- 'src/hb-fallback-shape.cc',
- 'src/hb-font.cc',
- 'src/hb-font.h',
- 'src/hb-font-private.hh',
- 'src/hb.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.h',
- 'src/hb-ot-head-table.hh',
- 'src/hb-ot-hhea-table.hh',
- 'src/hb-ot-hmtx-table.hh',
- 'src/hb-ot-layout.cc',
- '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-gsubgpos-private.hh',
- 'src/hb-ot-layout-gsub-table.hh',
- 'src/hb-ot-layout.h',
- 'src/hb-ot-layout-private.hh',
- 'src/hb-ot-map.cc',
- 'src/hb-ot-map-private.hh',
- 'src/hb-ot-maxp-table.hh',
- 'src/hb-ot-name-table.hh',
- 'src/hb-ot-shape.cc',
- 'src/hb-ot-shape-complex-arabic.cc',
- 'src/hb-ot-shape-complex-arabic-fallback.hh',
- 'src/hb-ot-shape-complex-arabic-table.hh',
- 'src/hb-ot-shape-complex-default.cc',
- 'src/hb-ot-shape-complex-hangul.cc',
- 'src/hb-ot-shape-complex-hebrew.cc',
- 'src/hb-ot-shape-complex-indic.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-myanmar.cc',
- 'src/hb-ot-shape-complex-myanmar-machine.hh',
- 'src/hb-ot-shape-complex-private.hh',
- 'src/hb-ot-shape-complex-sea.cc',
- 'src/hb-ot-shape-complex-sea-machine.hh',
- 'src/hb-ot-shape-complex-thai.cc',
- 'src/hb-ot-shape-complex-tibetan.cc',
- 'src/hb-ot-shape-fallback.cc',
- 'src/hb-ot-shape-fallback-private.hh',
- 'src/hb-ot-shape.h',
- 'src/hb-ot-shape-normalize.cc',
- 'src/hb-ot-shape-normalize-private.hh',
- 'src/hb-ot-shape-private.hh',
- 'src/hb-ot-tag.cc',
- 'src/hb-ot-tag.h',
- 'src/hb-private.hh',
- 'src/hb-set.cc',
- 'src/hb-set.h',
- 'src/hb-set-private.hh',
- 'src/hb-shape.cc',
- 'src/hb-shape.h',
- 'src/hb-shape-plan.cc',
- 'src/hb-shape-plan.h',
- 'src/hb-shape-plan-private.hh',
- 'src/hb-shaper.cc',
- 'src/hb-shaper-impl-private.hh',
- 'src/hb-shaper-list.hh',
- 'src/hb-shaper-private.hh',
- 'src/hb-unicode.cc',
- 'src/hb-unicode.h',
- 'src/hb-unicode-private.hh',
- 'src/hb-utf-private.hh',
- 'src/hb-version.h',
- 'src/hb-warning.cc',
- ],
- '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',
- ]
- }],
- ['OS=="win"', {
- # TODO(eae): C4267 on amd64. size_t -> int, size_t -> unsigned int
- 'msvs_disabled_warnings': [4267, 4334],
- }],
- ['OS=="mac"', {
- 'defines': [
- 'HAVE_CORETEXT',
- ],
- 'sources': [
- 'src/hb-coretext.cc',
- 'src/hb-coretext.h',
- ],
- }],
- ],
- },
- ],
- }, { # use_system_harfbuzz==1
- 'variables': {
- # Check for presence of harfbuzz-icu library, use it if present.
- 'harfbuzz_libraries':
- '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
- '--code "int main() { return 0; }" '
- '--run-linker '
- '--on-success "harfbuzz harfbuzz-icu" '
- '--on-failure "harfbuzz" '
- '-- -lharfbuzz-icu)',
- },
- 'targets': [
- {
- 'target_name': 'harfbuzz-ng',
- 'type': 'none',
- 'cflags': [
- '<!@(<(pkg-config) --cflags <(harfbuzz_libraries))',
- ],
- 'direct_dependent_settings': {
- 'cflags': [
- '<!@(<(pkg-config) --cflags <(harfbuzz_libraries))',
- ],
- },
- 'link_settings': {
- 'ldflags': [
- '<!@(<(pkg-config) --libs-only-L --libs-only-other <(harfbuzz_libraries))',
- ],
- 'libraries': [
- '<!@(<(pkg-config) --libs-only-l <(harfbuzz_libraries))',
- ],
- },
- },
- ],
- }],
],
}
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698