diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 21:02:27 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 21:02:27 +0000 |
| commit | 5d5fc10e532cc4bc1fdd7566605fc31bbd48fb47 (patch) | |
| tree | b869f40a2af3c87987b961ee997ec88b49bb2aa7 | |
| parent | e8eb4438b3467f2be6dcd65b585ca194937f217c (diff) | |
| download | libjpeg_turbo-5d5fc10e532cc4bc1fdd7566605fc31bbd48fb47.tar.gz | |
Update makefiles after merge of Chromium at a41c404b1c7f
This commit was generated by merge_from_chromium.py.
Change-Id: I31f134536f63cc5a9411d4ccba2ca18648796f56
| -rw-r--r-- | libjpeg.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/libjpeg.target.darwin-arm.mk b/libjpeg.target.darwin-arm.mk index a3bc170..41380de 100644 --- a/libjpeg.target.darwin-arm.mk +++ b/libjpeg.target.darwin-arm.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -229,6 +230,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.darwin-arm64.mk b/libjpeg.target.darwin-arm64.mk index d698aef..19b914c 100644 --- a/libjpeg.target.darwin-arm64.mk +++ b/libjpeg.target.darwin-arm64.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -206,6 +207,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.darwin-mips.mk b/libjpeg.target.darwin-mips.mk index c0116db..9dbc655 100644 --- a/libjpeg.target.darwin-mips.mk +++ b/libjpeg.target.darwin-mips.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -214,6 +215,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.darwin-x86.mk b/libjpeg.target.darwin-x86.mk index 9365b0f..a7875de 100644 --- a/libjpeg.target.darwin-x86.mk +++ b/libjpeg.target.darwin-x86.mk @@ -491,6 +491,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -584,6 +585,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.darwin-x86_64.mk b/libjpeg.target.darwin-x86_64.mk index 345c7de..0557c56 100644 --- a/libjpeg.target.darwin-x86_64.mk +++ b/libjpeg.target.darwin-x86_64.mk @@ -292,6 +292,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -384,6 +385,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.linux-arm.mk b/libjpeg.target.linux-arm.mk index a3bc170..41380de 100644 --- a/libjpeg.target.linux-arm.mk +++ b/libjpeg.target.linux-arm.mk @@ -130,6 +130,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -229,6 +230,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.linux-arm64.mk b/libjpeg.target.linux-arm64.mk index d698aef..19b914c 100644 --- a/libjpeg.target.linux-arm64.mk +++ b/libjpeg.target.linux-arm64.mk @@ -119,6 +119,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -206,6 +207,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.linux-mips.mk b/libjpeg.target.linux-mips.mk index c0116db..9dbc655 100644 --- a/libjpeg.target.linux-mips.mk +++ b/libjpeg.target.linux-mips.mk @@ -122,6 +122,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -214,6 +215,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.linux-x86.mk b/libjpeg.target.linux-x86.mk index 9365b0f..a7875de 100644 --- a/libjpeg.target.linux-x86.mk +++ b/libjpeg.target.linux-x86.mk @@ -491,6 +491,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -584,6 +585,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ diff --git a/libjpeg.target.linux-x86_64.mk b/libjpeg.target.linux-x86_64.mk index 345c7de..0557c56 100644 --- a/libjpeg.target.linux-x86_64.mk +++ b/libjpeg.target.linux-x86_64.mk @@ -292,6 +292,7 @@ MY_DEFS_Debug := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ @@ -384,6 +385,7 @@ MY_DEFS_Release := \ '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ |