diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-08-12 12:08:47 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-08-12 12:08:47 +0000 |
commit | 7bef3a6f4132a523c2c216da9a02af39e884be73 (patch) | |
tree | d7d2b545c650ca58e2a4bf56d274a133027d9cc2 | |
parent | 346651468f8e10a2f12fca26cbaa9ab5180f556a (diff) | |
download | openmax_dl-7bef3a6f4132a523c2c216da9a02af39e884be73.tar.gz |
Update makefiles after merge of Chromium at 288938
This commit was generated by merge_from_chromium.py.
Change-Id: I4e153e2a5936c41017868e397acdaaa04ca691d1
-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-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-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 |
12 files changed, 0 insertions, 24 deletions
diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk index 96058ee..d9bc0bf 100644 --- a/dl/openmax_dl.target.darwin-arm.mk +++ b/dl/openmax_dl.target.darwin-arm.mk @@ -127,7 +127,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -233,7 +232,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.darwin-arm64.mk b/dl/openmax_dl.target.darwin-arm64.mk index 0d3888c..cb86215 100644 --- a/dl/openmax_dl.target.darwin-arm64.mk +++ b/dl/openmax_dl.target.darwin-arm64.mk @@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -174,7 +173,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.darwin-mips.mk b/dl/openmax_dl.target.darwin-mips.mk index 49ec075..bb6d812 100644 --- a/dl/openmax_dl.target.darwin-mips.mk +++ b/dl/openmax_dl.target.darwin-mips.mk @@ -76,7 +76,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -177,7 +176,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk index ea25330..ccb3cd9 100644 --- a/dl/openmax_dl.target.darwin-x86.mk +++ b/dl/openmax_dl.target.darwin-x86.mk @@ -94,7 +94,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -194,7 +193,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk index 8310de7..a320ec3 100644 --- a/dl/openmax_dl.target.darwin-x86_64.mk +++ b/dl/openmax_dl.target.darwin-x86_64.mk @@ -93,7 +93,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -192,7 +191,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk index 96058ee..d9bc0bf 100644 --- a/dl/openmax_dl.target.linux-arm.mk +++ b/dl/openmax_dl.target.linux-arm.mk @@ -127,7 +127,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -233,7 +232,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.linux-arm64.mk b/dl/openmax_dl.target.linux-arm64.mk index 0d3888c..cb86215 100644 --- a/dl/openmax_dl.target.linux-arm64.mk +++ b/dl/openmax_dl.target.linux-arm64.mk @@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -174,7 +173,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.linux-mips.mk b/dl/openmax_dl.target.linux-mips.mk index 49ec075..bb6d812 100644 --- a/dl/openmax_dl.target.linux-mips.mk +++ b/dl/openmax_dl.target.linux-mips.mk @@ -76,7 +76,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -177,7 +176,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk index ea25330..ccb3cd9 100644 --- a/dl/openmax_dl.target.linux-x86.mk +++ b/dl/openmax_dl.target.linux-x86.mk @@ -94,7 +94,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -194,7 +193,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk index 8310de7..a320ec3 100644 --- a/dl/openmax_dl.target.linux-x86_64.mk +++ b/dl/openmax_dl.target.linux-x86_64.mk @@ -93,7 +93,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -192,7 +191,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk index d01be0d..c5c544d 100644 --- a/dl/openmax_dl_armv7.target.darwin-arm.mk +++ b/dl/openmax_dl_armv7.target.darwin-arm.mk @@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -185,7 +184,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index d01be0d..c5c544d 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -185,7 +184,6 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ - '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ |