diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 21:02:28 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 21:02:28 +0000 |
| commit | ca03c17a5f571111319ed73875497be3a67eb778 (patch) | |
| tree | ec7f4f9434517a51f7e8f36f45b0d21a91ee212e | |
| parent | e383af5625d55e99c6b3d6354f736deac1fd1959 (diff) | |
| download | ots-ca03c17a5f571111319ed73875497be3a67eb778.tar.gz | |
Update makefiles after merge of Chromium at a41c404b1c7f
This commit was generated by merge_from_chromium.py.
Change-Id: Idb352bee83b58e793dbe41c41ad5c1c21d8fd999
| -rw-r--r-- | ots.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | ots.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | ots.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | ots.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | ots.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | ots.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index 67e3933..8ae9d19 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -114,6 +114,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' \ @@ -210,6 +211,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/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index c0eef4f..f79f3ae 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -103,6 +103,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' \ @@ -187,6 +188,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/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk index 80a7902..59105ea 100644 --- a/ots.target.darwin-mips.mk +++ b/ots.target.darwin-mips.mk @@ -106,6 +106,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' \ @@ -194,6 +195,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/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index 49d836a..9df37e4 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -109,6 +109,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' \ @@ -199,6 +200,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/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index 3ecd8c2..c0e4be1 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -108,6 +108,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' \ @@ -197,6 +198,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/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index 67e3933..8ae9d19 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -114,6 +114,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' \ @@ -210,6 +211,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/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk index c0eef4f..f79f3ae 100644 --- a/ots.target.linux-arm64.mk +++ b/ots.target.linux-arm64.mk @@ -103,6 +103,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' \ @@ -187,6 +188,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/ots.target.linux-mips.mk b/ots.target.linux-mips.mk index 80a7902..59105ea 100644 --- a/ots.target.linux-mips.mk +++ b/ots.target.linux-mips.mk @@ -106,6 +106,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' \ @@ -194,6 +195,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/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index 49d836a..9df37e4 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -109,6 +109,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' \ @@ -199,6 +200,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/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index 3ecd8c2..c0e4be1 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -108,6 +108,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' \ @@ -197,6 +198,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' \ |