diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-11-05 21:58:14 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-11-05 21:58:14 +0000 |
commit | 7d145866dae79c2d6d6afa19c6b9f71e78577bb1 (patch) | |
tree | f601f3db3575154f77917d965080bea69930b3a5 | |
parent | 59f33ca576dff899b16e15221a44f9b0965c6a63 (diff) | |
download | openmax_dl-7d145866dae79c2d6d6afa19c6b9f71e78577bb1.tar.gz |
Update makefiles after merge of Chromium at 5a645aa13b82
This commit was generated by merge_from_chromium.py.
Change-Id: I8f2b0e5d5b3b0a76efc19e395876993adcc076cf
-rw-r--r-- | dl/openmax_dl.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.darwin-arm64.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.darwin-mips.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.darwin-mips64.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.darwin-x86.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.darwin-x86_64.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.linux-arm.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.linux-arm64.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.linux-mips.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.linux-mips64.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.linux-x86.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl.target.linux-x86_64.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl_armv7.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 2 |
14 files changed, 28 insertions, 0 deletions
diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk index 5734f92..6eff77d 100644 --- a/dl/openmax_dl.target.darwin-arm.mk +++ b/dl/openmax_dl.target.darwin-arm.mk @@ -143,6 +143,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -244,6 +245,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.darwin-arm64.mk b/dl/openmax_dl.target.darwin-arm64.mk index 39626d8..8714238 100644 --- a/dl/openmax_dl.target.darwin-arm64.mk +++ b/dl/openmax_dl.target.darwin-arm64.mk @@ -97,6 +97,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -185,6 +186,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.darwin-mips.mk b/dl/openmax_dl.target.darwin-mips.mk index 35c8a00..e4f2f54 100644 --- a/dl/openmax_dl.target.darwin-mips.mk +++ b/dl/openmax_dl.target.darwin-mips.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -182,6 +183,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.darwin-mips64.mk b/dl/openmax_dl.target.darwin-mips64.mk index 80bd97d..82657a7 100644 --- a/dl/openmax_dl.target.darwin-mips64.mk +++ b/dl/openmax_dl.target.darwin-mips64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -172,6 +173,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk index 88d81c3..da9bc0c 100644 --- a/dl/openmax_dl.target.darwin-x86.mk +++ b/dl/openmax_dl.target.darwin-x86.mk @@ -109,6 +109,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -203,6 +204,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk index c428a43..304175b 100644 --- a/dl/openmax_dl.target.darwin-x86_64.mk +++ b/dl/openmax_dl.target.darwin-x86_64.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -201,6 +202,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk index 5734f92..6eff77d 100644 --- a/dl/openmax_dl.target.linux-arm.mk +++ b/dl/openmax_dl.target.linux-arm.mk @@ -143,6 +143,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -244,6 +245,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.linux-arm64.mk b/dl/openmax_dl.target.linux-arm64.mk index 39626d8..8714238 100644 --- a/dl/openmax_dl.target.linux-arm64.mk +++ b/dl/openmax_dl.target.linux-arm64.mk @@ -97,6 +97,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -185,6 +186,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.linux-mips.mk b/dl/openmax_dl.target.linux-mips.mk index 35c8a00..e4f2f54 100644 --- a/dl/openmax_dl.target.linux-mips.mk +++ b/dl/openmax_dl.target.linux-mips.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -182,6 +183,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.linux-mips64.mk b/dl/openmax_dl.target.linux-mips64.mk index 80bd97d..82657a7 100644 --- a/dl/openmax_dl.target.linux-mips64.mk +++ b/dl/openmax_dl.target.linux-mips64.mk @@ -80,6 +80,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -172,6 +173,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk index 88d81c3..da9bc0c 100644 --- a/dl/openmax_dl.target.linux-x86.mk +++ b/dl/openmax_dl.target.linux-x86.mk @@ -109,6 +109,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -203,6 +204,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk index c428a43..304175b 100644 --- a/dl/openmax_dl.target.linux-x86_64.mk +++ b/dl/openmax_dl.target.linux-x86_64.mk @@ -108,6 +108,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -201,6 +202,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk index 5cc77ee..1c8dd64 100644 --- a/dl/openmax_dl_armv7.target.darwin-arm.mk +++ b/dl/openmax_dl_armv7.target.darwin-arm.mk @@ -97,6 +97,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -196,6 +197,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index 5cc77ee..1c8dd64 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -97,6 +97,7 @@ MY_DEFS_Debug := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -196,6 +197,7 @@ MY_DEFS_Release := \ '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ |