diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-19 22:50:10 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-19 22:50:10 +0000 |
| commit | e2e0cbd1bb34dc18c813f63d97289f6b75b26783 (patch) | |
| tree | 9a3d714d441856073300c43f8278155015315f4d /ft2.target.linux-x86.mk | |
| parent | 3c4bb17ebfead7ceee056091e8c5f762709b5f64 (diff) | |
| download | freetype-e2e0cbd1bb34dc18c813f63d97289f6b75b26783.tar.gz | |
Update makefiles after merge of Chromium at 89b463ddd92b
This commit was generated by merge_from_chromium.py.
Change-Id: I9252b44f242eeb73b109253a8e989cde7db63ed0
Diffstat (limited to 'ft2.target.linux-x86.mk')
| -rw-r--r-- | ft2.target.linux-x86.mk | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 3768c3c..3bdcfcd 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_freetype_ft2_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -125,10 +126,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ $(LOCAL_PATH)/third_party/libpng \ - $(LOCAL_PATH)/third_party/zlib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/zlib # Flags passed to only C++ (and not C) files. @@ -226,10 +224,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ $(LOCAL_PATH)/third_party/libpng \ - $(LOCAL_PATH)/third_party/zlib \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(LOCAL_PATH)/third_party/zlib # Flags passed to only C++ (and not C) files. @@ -252,13 +247,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules |