diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-25 15:58:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-25 15:58:17 +0000 |
| commit | 2d47722ceba1e11d1de0cf7085a7b1771e1a9dae (patch) | |
| tree | e190ce2c9ffafa72b30b422c6ad19884bd22beb9 | |
| parent | da1db04101b57a1bad4b2f98f8898a0cf01f56e6 (diff) | |
| parent | 5d7edd230915b96abb7b4ce8fe66b582920b5059 (diff) | |
| download | angle_dx11-idea133-weekly-release.tar.gz | |
Merge "Update makefiles following gyp r1857 cherrypick."chromium_org-pre-replicationidea133-weekly-release
| -rw-r--r-- | src/preprocessor.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-x86.mk | 1 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | src/translator_common.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | src/translator_common.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | src/translator_common.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | src/translator_common.target.linux-x86.mk | 1 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | src/translator_glsl.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | src/translator_glsl.target.linux-x86.mk | 1 |
18 files changed, 18 insertions, 0 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk index 31c9ec76..e6982c34 100644 --- a/src/preprocessor.target.darwin-arm.mk +++ b/src/preprocessor.target.darwin-arm.mk @@ -210,6 +210,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/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk index 3fc00116..280f7e78 100644 --- a/src/preprocessor.target.darwin-mips.mk +++ b/src/preprocessor.target.darwin-mips.mk @@ -210,6 +210,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/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk index 50f920b9..75ee1df1 100644 --- a/src/preprocessor.target.darwin-x86.mk +++ b/src/preprocessor.target.darwin-x86.mk @@ -214,6 +214,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/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk index 31c9ec76..e6982c34 100644 --- a/src/preprocessor.target.linux-arm.mk +++ b/src/preprocessor.target.linux-arm.mk @@ -210,6 +210,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/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk index 3fc00116..280f7e78 100644 --- a/src/preprocessor.target.linux-mips.mk +++ b/src/preprocessor.target.linux-mips.mk @@ -210,6 +210,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/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk index 50f920b9..75ee1df1 100644 --- a/src/preprocessor.target.linux-x86.mk +++ b/src/preprocessor.target.linux-x86.mk @@ -214,6 +214,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/src/translator_common.target.darwin-arm.mk b/src/translator_common.target.darwin-arm.mk index a0401336..39f118c5 100644 --- a/src/translator_common.target.darwin-arm.mk +++ b/src/translator_common.target.darwin-arm.mk @@ -241,6 +241,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/src/translator_common.target.darwin-mips.mk b/src/translator_common.target.darwin-mips.mk index ad1ed22a..eaee5b9a 100644 --- a/src/translator_common.target.darwin-mips.mk +++ b/src/translator_common.target.darwin-mips.mk @@ -241,6 +241,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/src/translator_common.target.darwin-x86.mk b/src/translator_common.target.darwin-x86.mk index 23fddb04..9e1c5963 100644 --- a/src/translator_common.target.darwin-x86.mk +++ b/src/translator_common.target.darwin-x86.mk @@ -245,6 +245,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/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk index a0401336..39f118c5 100644 --- a/src/translator_common.target.linux-arm.mk +++ b/src/translator_common.target.linux-arm.mk @@ -241,6 +241,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/src/translator_common.target.linux-mips.mk b/src/translator_common.target.linux-mips.mk index ad1ed22a..eaee5b9a 100644 --- a/src/translator_common.target.linux-mips.mk +++ b/src/translator_common.target.linux-mips.mk @@ -241,6 +241,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/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk index 23fddb04..9e1c5963 100644 --- a/src/translator_common.target.linux-x86.mk +++ b/src/translator_common.target.linux-x86.mk @@ -245,6 +245,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/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk index 7c1cf91c..b5ab20ac 100644 --- a/src/translator_glsl.target.darwin-arm.mk +++ b/src/translator_glsl.target.darwin-arm.mk @@ -213,6 +213,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/src/translator_glsl.target.darwin-mips.mk b/src/translator_glsl.target.darwin-mips.mk index b0e8e615..e05c1279 100644 --- a/src/translator_glsl.target.darwin-mips.mk +++ b/src/translator_glsl.target.darwin-mips.mk @@ -213,6 +213,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/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk index 84defe27..454b9f2b 100644 --- a/src/translator_glsl.target.darwin-x86.mk +++ b/src/translator_glsl.target.darwin-x86.mk @@ -217,6 +217,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/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk index 7c1cf91c..b5ab20ac 100644 --- a/src/translator_glsl.target.linux-arm.mk +++ b/src/translator_glsl.target.linux-arm.mk @@ -213,6 +213,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/src/translator_glsl.target.linux-mips.mk b/src/translator_glsl.target.linux-mips.mk index b0e8e615..e05c1279 100644 --- a/src/translator_glsl.target.linux-mips.mk +++ b/src/translator_glsl.target.linux-mips.mk @@ -213,6 +213,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/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk index 84defe27..454b9f2b 100644 --- a/src/translator_glsl.target.linux-x86.mk +++ b/src/translator_glsl.target.linux-x86.mk @@ -217,6 +217,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 := \ |