summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-07-03 20:21:11 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-07-03 20:21:11 +0000
commit6be54267d813912fd2a56e37eeb291e04ecc2b8b (patch)
tree8aaaed313ca529cd2e44863b8f3e0af93897904b
parentae7ff6f0516e43ed3b6fdc9af89f2aa1b23d8eeb (diff)
downloadangle_dx11-6be54267d813912fd2a56e37eeb291e04ecc2b8b.tar.gz
Update makefiles after merge of Chromium at r210032
This commit was generated by merge_from_chromium.py. Change-Id: If29b82bacdab6afc2e30790e289c39ab2dda40c3
Diffstat
-rw-r--r--src/preprocessor.target.darwin-arm.mk4
-rw-r--r--src/preprocessor.target.darwin-mips.mk4
-rw-r--r--src/preprocessor.target.darwin-x86.mk4
-rw-r--r--src/preprocessor.target.linux-arm.mk4
-rw-r--r--src/preprocessor.target.linux-mips.mk4
-rw-r--r--src/preprocessor.target.linux-x86.mk4
-rw-r--r--src/translator_common.target.darwin-arm.mk4
-rw-r--r--src/translator_common.target.darwin-mips.mk4
-rw-r--r--src/translator_common.target.darwin-x86.mk4
-rw-r--r--src/translator_common.target.linux-arm.mk4
-rw-r--r--src/translator_common.target.linux-mips.mk4
-rw-r--r--src/translator_common.target.linux-x86.mk4
-rw-r--r--src/translator_glsl.target.darwin-arm.mk4
-rw-r--r--src/translator_glsl.target.darwin-mips.mk4
-rw-r--r--src/translator_glsl.target.darwin-x86.mk4
-rw-r--r--src/translator_glsl.target.linux-arm.mk4
-rw-r--r--src/translator_glsl.target.linux-mips.mk4
-rw-r--r--src/translator_glsl.target.linux-x86.mk4
18 files changed, 18 insertions, 54 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk
index a40116c8..127aa857 100644
--- a/src/preprocessor.target.darwin-arm.mk
+++ b/src/preprocessor.target.darwin-arm.mk
@@ -217,7 +217,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -236,8 +235,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk
index 9cbde2b8..6b7fcdd7 100644
--- a/src/preprocessor.target.darwin-mips.mk
+++ b/src/preprocessor.target.darwin-mips.mk
@@ -213,7 +213,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -230,8 +229,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk
index 25cc6efe..381b9296 100644
--- a/src/preprocessor.target.darwin-x86.mk
+++ b/src/preprocessor.target.darwin-x86.mk
@@ -219,7 +219,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -236,8 +235,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index a40116c8..127aa857 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk
@@ -217,7 +217,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -236,8 +235,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk
index 9cbde2b8..6b7fcdd7 100644
--- a/src/preprocessor.target.linux-mips.mk
+++ b/src/preprocessor.target.linux-mips.mk
@@ -213,7 +213,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -230,8 +229,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk
index 25cc6efe..381b9296 100644
--- a/src/preprocessor.target.linux-x86.mk
+++ b/src/preprocessor.target.linux-x86.mk
@@ -219,7 +219,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -236,8 +235,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_common.target.darwin-arm.mk b/src/translator_common.target.darwin-arm.mk
index b1521f75..d9a16af6 100644
--- a/src/translator_common.target.darwin-arm.mk
+++ b/src/translator_common.target.darwin-arm.mk
@@ -248,7 +248,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -267,8 +266,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_common.target.darwin-mips.mk b/src/translator_common.target.darwin-mips.mk
index 73d9fbbc..19445433 100644
--- a/src/translator_common.target.darwin-mips.mk
+++ b/src/translator_common.target.darwin-mips.mk
@@ -244,7 +244,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -261,8 +260,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_common.target.darwin-x86.mk b/src/translator_common.target.darwin-x86.mk
index 1fbb2edb..65fe19c8 100644
--- a/src/translator_common.target.darwin-x86.mk
+++ b/src/translator_common.target.darwin-x86.mk
@@ -250,7 +250,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -267,8 +266,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk
index b1521f75..d9a16af6 100644
--- a/src/translator_common.target.linux-arm.mk
+++ b/src/translator_common.target.linux-arm.mk
@@ -248,7 +248,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -267,8 +266,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_common.target.linux-mips.mk b/src/translator_common.target.linux-mips.mk
index 73d9fbbc..19445433 100644
--- a/src/translator_common.target.linux-mips.mk
+++ b/src/translator_common.target.linux-mips.mk
@@ -244,7 +244,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -261,8 +260,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk
index 1fbb2edb..65fe19c8 100644
--- a/src/translator_common.target.linux-x86.mk
+++ b/src/translator_common.target.linux-x86.mk
@@ -250,7 +250,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -267,8 +266,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk
index df5792b2..b8b08042 100644
--- a/src/translator_glsl.target.darwin-arm.mk
+++ b/src/translator_glsl.target.darwin-arm.mk
@@ -220,7 +220,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -239,8 +238,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_glsl.target.darwin-mips.mk b/src/translator_glsl.target.darwin-mips.mk
index 5a074f0e..3c3797d6 100644
--- a/src/translator_glsl.target.darwin-mips.mk
+++ b/src/translator_glsl.target.darwin-mips.mk
@@ -216,7 +216,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -233,8 +232,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk
index 95e0906a..c24b2d65 100644
--- a/src/translator_glsl.target.darwin-x86.mk
+++ b/src/translator_glsl.target.darwin-x86.mk
@@ -222,7 +222,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -239,8 +238,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk
index df5792b2..b8b08042 100644
--- a/src/translator_glsl.target.linux-arm.mk
+++ b/src/translator_glsl.target.linux-arm.mk
@@ -220,7 +220,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -239,8 +238,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_glsl.target.linux-mips.mk b/src/translator_glsl.target.linux-mips.mk
index 5a074f0e..3c3797d6 100644
--- a/src/translator_glsl.target.linux-mips.mk
+++ b/src/translator_glsl.target.linux-mips.mk
@@ -216,7 +216,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -233,8 +232,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
diff --git a/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk
index 95e0906a..c24b2d65 100644
--- a/src/translator_glsl.target.linux-x86.mk
+++ b/src/translator_glsl.target.linux-x86.mk
@@ -222,7 +222,6 @@ LOCAL_LDFLAGS_Debug := \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--gc-sections \
- -Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -239,8 +238,7 @@ LOCAL_LDFLAGS_Release := \
-Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
- -Wl,--gc-sections \
- -Wl,--warn-shared-textrel
+ -Wl,--gc-sections
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 13:55:47 +0000