diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-02-21 23:58:49 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-02-21 23:58:49 +0000 |
| commit | b48ef4fe0cb1cde4cbdb2aeedc8e932e7443ce57 (patch) | |
| tree | fe808bf6d59d830dc581d0ee15627761bd186761 | |
| parent | 8c14a93fb15049305837987066b945ccaab14dd1 (diff) | |
| download | freetype-b48ef4fe0cb1cde4cbdb2aeedc8e932e7443ce57.tar.gz | |
Update makefiles after merge of Chromium at 252692
This commit was generated by merge_from_chromium.py.
Change-Id: I251000b0ea69dc69a414770ce2059af0bc0d4cd0
| -rw-r--r-- | ft2.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index c085a68..b0feb2e 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -231,6 +231,7 @@ LOCAL_CPPFLAGS_Release := \ LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index adf74b0..3c51669 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -231,6 +231,7 @@ LOCAL_CPPFLAGS_Release := \ LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 7499368..d97c3bc 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -233,6 +233,7 @@ LOCAL_CPPFLAGS_Release := \ LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index c085a68..b0feb2e 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -231,6 +231,7 @@ LOCAL_CPPFLAGS_Release := \ LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index adf74b0..3c51669 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -231,6 +231,7 @@ LOCAL_CPPFLAGS_Release := \ LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 7499368..d97c3bc 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -233,6 +233,7 @@ LOCAL_CPPFLAGS_Release := \ LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ |