summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-11-14 16:29:04 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-11-14 16:29:04 +0000
commitab53caecc8bef9e989a85ff841100df1e9b44708 (patch)
treeb9bcfc8d279956d515666dca0c5c28342bdd6eac
parentddd3fdf76f44762e4534c14acd2faddfa0caf00b (diff)
downloadangle_dx11-ab53caecc8bef9e989a85ff841100df1e9b44708.tar.gz
Update makefiles after merge of Chromium at 235157
This commit was generated by merge_from_chromium.py. Change-Id: I9a15533e8e8da02831b0208253c2c83e261eabae
Diffstat
-rw-r--r--src/preprocessor.target.darwin-arm.mk2
-rw-r--r--src/preprocessor.target.darwin-mips.mk2
-rw-r--r--src/preprocessor.target.darwin-x86.mk2
-rw-r--r--src/preprocessor.target.linux-arm.mk2
-rw-r--r--src/preprocessor.target.linux-mips.mk2
-rw-r--r--src/preprocessor.target.linux-x86.mk2
-rw-r--r--src/translator.target.darwin-arm.mk2
-rw-r--r--src/translator.target.darwin-mips.mk2
-rw-r--r--src/translator.target.darwin-x86.mk2
-rw-r--r--src/translator.target.linux-arm.mk2
-rw-r--r--src/translator.target.linux-mips.mk2
-rw-r--r--src/translator.target.linux-x86.mk2
12 files changed, 24 insertions, 0 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk
index 65dea454..4bd714e6 100644
--- a/src/preprocessor.target.darwin-arm.mk
+++ b/src/preprocessor.target.darwin-arm.mk
@@ -88,6 +88,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -171,6 +172,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk
index 9e1d0a02..cf665a41 100644
--- a/src/preprocessor.target.darwin-mips.mk
+++ b/src/preprocessor.target.darwin-mips.mk
@@ -88,6 +88,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -171,6 +172,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk
index 8411f3f5..3ba28657 100644
--- a/src/preprocessor.target.darwin-x86.mk
+++ b/src/preprocessor.target.darwin-x86.mk
@@ -90,6 +90,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -176,6 +177,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index 65dea454..4bd714e6 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk
@@ -88,6 +88,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -171,6 +172,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk
index 9e1d0a02..cf665a41 100644
--- a/src/preprocessor.target.linux-mips.mk
+++ b/src/preprocessor.target.linux-mips.mk
@@ -88,6 +88,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -171,6 +172,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk
index 8411f3f5..3ba28657 100644
--- a/src/preprocessor.target.linux-x86.mk
+++ b/src/preprocessor.target.linux-x86.mk
@@ -90,6 +90,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -176,6 +177,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
diff --git a/src/translator.target.darwin-arm.mk b/src/translator.target.darwin-arm.mk
index a702dd64..9ffde69e 100644
--- a/src/translator.target.darwin-arm.mk
+++ b/src/translator.target.darwin-arm.mk
@@ -128,6 +128,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -214,6 +215,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
diff --git a/src/translator.target.darwin-mips.mk b/src/translator.target.darwin-mips.mk
index 84b88f3b..af2a2d5d 100644
--- a/src/translator.target.darwin-mips.mk
+++ b/src/translator.target.darwin-mips.mk
@@ -128,6 +128,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -214,6 +215,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
diff --git a/src/translator.target.darwin-x86.mk b/src/translator.target.darwin-x86.mk
index 550bf55c..39587236 100644
--- a/src/translator.target.darwin-x86.mk
+++ b/src/translator.target.darwin-x86.mk
@@ -130,6 +130,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -219,6 +220,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
diff --git a/src/translator.target.linux-arm.mk b/src/translator.target.linux-arm.mk
index a702dd64..9ffde69e 100644
--- a/src/translator.target.linux-arm.mk
+++ b/src/translator.target.linux-arm.mk
@@ -128,6 +128,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -214,6 +215,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
diff --git a/src/translator.target.linux-mips.mk b/src/translator.target.linux-mips.mk
index 84b88f3b..af2a2d5d 100644
--- a/src/translator.target.linux-mips.mk
+++ b/src/translator.target.linux-mips.mk
@@ -128,6 +128,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -214,6 +215,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
diff --git a/src/translator.target.linux-x86.mk b/src/translator.target.linux-x86.mk
index 550bf55c..39587236 100644
--- a/src/translator.target.linux-x86.mk
+++ b/src/translator.target.linux-x86.mk
@@ -130,6 +130,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -219,6 +220,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_MANAGED_USERS=1' \
'-DANGLE_TRANSLATOR_IMPLEMENTATION' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 09:19:48 +0000