diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-05-28 11:16:38 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-05-28 11:16:38 +0000 |
| commit | 9fec8b2a459bb8d4b03f8977c87e2a770a7ba8b5 (patch) | |
| tree | 123ce7d503fbfe655fb947ec3f0effe260b3abfb | |
| parent | 8afda9de71c5c73e5f854d66538a33c3586503a6 (diff) | |
| download | freetype-9fec8b2a459bb8d4b03f8977c87e2a770a7ba8b5.tar.gz | |
Update makefiles after merge of Chromium at r202530
This commit was generated by merge_from_chromium.py.
Change-Id: Idde9cba1e85d26852486cb3e0db6d8a9af095732
| -rw-r--r-- | ft2.target.darwin-arm.mk | 6 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 6 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 6 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index cc902c5..55cf8c2 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -111,9 +111,9 @@ LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/bionic \ - $(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES) diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 98af923..d4bafd1 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -113,9 +113,9 @@ LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/bionic \ - $(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES) diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index cc902c5..55cf8c2 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -111,9 +111,9 @@ LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/bionic \ - $(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES) diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 98af923..d4bafd1 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -113,9 +113,9 @@ LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/bionic \ - $(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES) |