diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-08-19 13:00:54 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-08-19 13:00:54 +0100 |
commit | b1fd96f45674a9676eb39b8c5fbb6fe7f690b6b3 (patch) | |
tree | f2005265f38360ad30b7195e6a244f432445a4fa | |
parent | 4345e61f5cad84e97f2ba559ea182d3c70e62cfe (diff) | |
parent | a0b1f89789427ae9d0b0fb8025b7569c6b456a3b (diff) | |
download | ots-b1fd96f45674a9676eb39b8c5fbb6fe7f690b6b3.tar.gz |
Merge from Chromium at DEPS revision 290040android-wear-5.1.1_r1android-wear-5.1.0_r1
This commit was generated by merge_to_master.py.
Change-Id: Idb5ee06ccec05b1a4a65ac9f612ec940887cefff
-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, 0 insertions, 20 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index c12d2dc..90c309a 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -102,7 +102,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' \ @@ -206,7 +205,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/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index 358cedc..58a2232 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -91,7 +91,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' \ @@ -183,7 +182,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/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk index fada1b0..ce45601 100644 --- a/ots.target.darwin-mips.mk +++ b/ots.target.darwin-mips.mk @@ -96,7 +96,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/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index a655f90..7f178fa 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -97,7 +97,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' \ @@ -195,7 +194,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/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index 4150495..8dadf0a 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -96,7 +96,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' \ @@ -193,7 +192,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/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index c12d2dc..90c309a 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -102,7 +102,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' \ @@ -206,7 +205,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/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk index 358cedc..58a2232 100644 --- a/ots.target.linux-arm64.mk +++ b/ots.target.linux-arm64.mk @@ -91,7 +91,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' \ @@ -183,7 +182,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/ots.target.linux-mips.mk b/ots.target.linux-mips.mk index fada1b0..ce45601 100644 --- a/ots.target.linux-mips.mk +++ b/ots.target.linux-mips.mk @@ -96,7 +96,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/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index a655f90..7f178fa 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -97,7 +97,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' \ @@ -195,7 +194,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/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index 4150495..8dadf0a 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -96,7 +96,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' \ @@ -193,7 +192,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' \ |