diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-12-02 22:03:58 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-12-02 22:03:58 +0000 |
| commit | fa231e1d53674ed865c7f3fdc4c4b9bc4fd441d5 (patch) | |
| tree | 7b2a67b493c0ec7eb6b0f9d429431b03cead1344 | |
| parent | cd300b62412336df17e6ee4eab47afa659777043 (diff) | |
| download | angle_dx11-fa231e1d53674ed865c7f3fdc4c4b9bc4fd441d5.tar.gz | |
Update makefiles after merge of Chromium at 238197
This commit was generated by merge_from_chromium.py.
Change-Id: I9409996cdf6a92a311569d7828cc224bbdedeb82
| -rw-r--r-- | src/preprocessor.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | src/translator.target.linux-x86.mk | 2 |
12 files changed, 24 insertions, 0 deletions
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk index 52627b52..64b999f3 100644 --- a/src/preprocessor.target.darwin-arm.mk +++ b/src/preprocessor.target.darwin-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk index 17ffef6e..aa414c9c 100644 --- a/src/preprocessor.target.darwin-mips.mk +++ b/src/preprocessor.target.darwin-mips.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk index 88ee9221..90b16788 100644 --- a/src/preprocessor.target.darwin-x86.mk +++ b/src/preprocessor.target.darwin-x86.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -179,6 +180,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk index 52627b52..64b999f3 100644 --- a/src/preprocessor.target.linux-arm.mk +++ b/src/preprocessor.target.linux-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk index 17ffef6e..aa414c9c 100644 --- a/src/preprocessor.target.linux-mips.mk +++ b/src/preprocessor.target.linux-mips.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk index 88ee9221..90b16788 100644 --- a/src/preprocessor.target.linux-x86.mk +++ b/src/preprocessor.target.linux-x86.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ @@ -179,6 +180,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ diff --git a/src/translator.target.darwin-arm.mk b/src/translator.target.darwin-arm.mk index b48f0735..8b0aad47 100644 --- a/src/translator.target.darwin-arm.mk +++ b/src/translator.target.darwin-arm.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ diff --git a/src/translator.target.darwin-mips.mk b/src/translator.target.darwin-mips.mk index 0332fe2a..b6a42817 100644 --- a/src/translator.target.darwin-mips.mk +++ b/src/translator.target.darwin-mips.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ diff --git a/src/translator.target.darwin-x86.mk b/src/translator.target.darwin-x86.mk index baf9e4eb..cf8fb436 100644 --- a/src/translator.target.darwin-x86.mk +++ b/src/translator.target.darwin-x86.mk @@ -131,6 +131,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ @@ -222,6 +223,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ diff --git a/src/translator.target.linux-arm.mk b/src/translator.target.linux-arm.mk index b48f0735..8b0aad47 100644 --- a/src/translator.target.linux-arm.mk +++ b/src/translator.target.linux-arm.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ diff --git a/src/translator.target.linux-mips.mk b/src/translator.target.linux-mips.mk index 0332fe2a..b6a42817 100644 --- a/src/translator.target.linux-mips.mk +++ b/src/translator.target.linux-mips.mk @@ -129,6 +129,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ diff --git a/src/translator.target.linux-x86.mk b/src/translator.target.linux-x86.mk index baf9e4eb..cf8fb436 100644 --- a/src/translator.target.linux-x86.mk +++ b/src/translator.target.linux-x86.mk @@ -131,6 +131,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ @@ -222,6 +223,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DANGLE_TRANSLATOR_IMPLEMENTATION' \ '-DANDROID' \ |