Update makefiles after merge of Chromium at r188769
This commit was generated by merge_from_chromium.py.
Change-Id: I9df38881144d77b9cbef90d28add4d37105ad584
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
deleted file mode 100644
index 1a5c681..0000000
--- a/ots.target.darwin-arm.mk
+++ /dev/null
@@ -1,176 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_ots_ots_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
- third_party/ots/src/cff.cc \
- third_party/ots/src/cff_type2_charstring.cc \
- third_party/ots/src/cmap.cc \
- third_party/ots/src/cvt.cc \
- third_party/ots/src/fpgm.cc \
- third_party/ots/src/gasp.cc \
- third_party/ots/src/gdef.cc \
- third_party/ots/src/glyf.cc \
- third_party/ots/src/gpos.cc \
- third_party/ots/src/gsub.cc \
- third_party/ots/src/hdmx.cc \
- third_party/ots/src/head.cc \
- third_party/ots/src/hhea.cc \
- third_party/ots/src/hmtx.cc \
- third_party/ots/src/kern.cc \
- third_party/ots/src/layout.cc \
- third_party/ots/src/loca.cc \
- third_party/ots/src/ltsh.cc \
- third_party/ots/src/maxp.cc \
- third_party/ots/src/metrics.cc \
- third_party/ots/src/name.cc \
- third_party/ots/src/os2.cc \
- third_party/ots/src/ots.cc \
- third_party/ots/src/post.cc \
- third_party/ots/src/prep.cc \
- third_party/ots/src/vdmx.cc \
- third_party/ots/src/vhea.cc \
- third_party/ots/src/vmtx.cc \
- third_party/ots/src/vorg.cc
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS := \
- -fstack-protector \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -fno-tree-sra \
- -fuse-ld=gold \
- -Wno-psabi \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fstack-protector \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -Os \
- -g \
- -fomit-frame-pointer \
- -fdata-sections \
- -ffunction-sections
-
-MY_CFLAGS_C :=
-
-MY_DEFS := \
- '-DUSE_SKIA' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_PEPPER_THREADING' \
- '-DENABLE_GPU=1' \
- '-DUSE_OPENSSL=1' \
- '-DENABLE_EGLIMAGE=1' \
- '-DENABLE_LANGUAGE_DETECTION=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
- '-D_DEBUG'
-
-LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/zlib \
- $(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \
- $(GYP_ABS_ANDROID_TOP_DIR)/bionic \
- $(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport
-
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES)
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-abi \
- -Wno-error=c++0x-compat \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-### Rules for final target.
-
-LOCAL_LDFLAGS := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,-z,noexecstack \
- -fPIC \
- -Wl,-z,relro \
- -Wl,-z,now \
- -fuse-ld=gold \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,--icf=safe \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections
-
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport \
- libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_ots_ots_gyp
-
-# Alias gyp target name.
-.PHONY: ots
-ots: third_party_ots_ots_gyp
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
deleted file mode 100644
index 06d00bc..0000000
--- a/ots.target.darwin-x86.mk
+++ /dev/null
@@ -1,173 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_ots_ots_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-gyp_intermediate_dir := $(call local-intermediates-dir)
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
- third_party/ots/src/cff.cc \
- third_party/ots/src/cff_type2_charstring.cc \
- third_party/ots/src/cmap.cc \
- third_party/ots/src/cvt.cc \
- third_party/ots/src/fpgm.cc \
- third_party/ots/src/gasp.cc \
- third_party/ots/src/gdef.cc \
- third_party/ots/src/glyf.cc \
- third_party/ots/src/gpos.cc \
- third_party/ots/src/gsub.cc \
- third_party/ots/src/hdmx.cc \
- third_party/ots/src/head.cc \
- third_party/ots/src/hhea.cc \
- third_party/ots/src/hmtx.cc \
- third_party/ots/src/kern.cc \
- third_party/ots/src/layout.cc \
- third_party/ots/src/loca.cc \
- third_party/ots/src/ltsh.cc \
- third_party/ots/src/maxp.cc \
- third_party/ots/src/metrics.cc \
- third_party/ots/src/name.cc \
- third_party/ots/src/os2.cc \
- third_party/ots/src/ots.cc \
- third_party/ots/src/post.cc \
- third_party/ots/src/prep.cc \
- third_party/ots/src/vdmx.cc \
- third_party/ots/src/vhea.cc \
- third_party/ots/src/vmtx.cc \
- third_party/ots/src/vorg.cc
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS := \
- --param=ssp-buffer-size=4 \
- -Werror \
- -fno-exceptions \
- -fno-strict-aliasing \
- -Wall \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
- -fvisibility=hidden \
- -pipe \
- -fPIC \
- -m32 \
- -mmmx \
- -march=pentium4 \
- -msse2 \
- -mfpmath=sse \
- -ffunction-sections \
- -funwind-tables \
- -g \
- -fno-short-enums \
- -finline-limit=64 \
- -Wa,--noexecstack \
- -U_FORTIFY_SOURCE \
- -Wno-extra \
- -Wno-ignored-qualifiers \
- -Wno-type-limits \
- -fno-stack-protector \
- -Os \
- -g \
- -fomit-frame-pointer \
- -fdata-sections \
- -ffunction-sections
-
-MY_CFLAGS_C :=
-
-MY_DEFS := \
- '-DUSE_SKIA' \
- '-D_FILE_OFFSET_BITS=64' \
- '-DUSE_LINUX_BREAKPAD' \
- '-DNO_TCMALLOC' \
- '-DDISABLE_NACL' \
- '-DCHROMIUM_BUILD' \
- '-DUSE_LIBJPEG_TURBO=1' \
- '-DUSE_PROPRIETARY_CODECS' \
- '-DENABLE_PEPPER_THREADING' \
- '-DENABLE_GPU=1' \
- '-DUSE_OPENSSL=1' \
- '-DENABLE_EGLIMAGE=1' \
- '-DENABLE_LANGUAGE_DETECTION=1' \
- '-D__STDC_CONSTANT_MACROS' \
- '-D__STDC_FORMAT_MACROS' \
- '-DANDROID' \
- '-D__GNU_SOURCE=1' \
- '-DUSE_STLPORT=1' \
- '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
- '-DCHROME_BUILD_ID=""' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
- '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
- '-D_DEBUG'
-
-LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/zlib \
- $(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \
- $(GYP_ABS_ANDROID_TOP_DIR)/bionic \
- $(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport
-
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES)
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS := \
- -fno-rtti \
- -fno-threadsafe-statics \
- -fvisibility-inlines-hidden \
- -Wsign-compare \
- -Wno-error=c++0x-compat \
- -Wno-non-virtual-dtor \
- -Wno-sign-promo
-
-### Rules for final target.
-
-LOCAL_LDFLAGS := \
- -Wl,-z,now \
- -Wl,-z,relro \
- -Wl,-z,noexecstack \
- -fPIC \
- -m32 \
- -nostdlib \
- -Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
- -Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections
-
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport \
- libdl
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_ots_ots_gyp
-
-# Alias gyp target name.
-.PHONY: ots
-ots: third_party_ots_ots_gyp
-
-include $(BUILD_STATIC_LIBRARY)
