Dan Willemsen
6d65635ef7
am 48d95e75
: am 05d97fe7
: Merge "Remove legacy windows platform build support"
...
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
Remove legacy windows platform build support
2015-08-18 04:43:06 +00:00
Dan Willemsen
48d95e7525
am 05d97fe7
: Merge "Remove legacy windows platform build support"
...
* commit '05d97fe723ea376edb5fe6b12535485311a32418':
Remove legacy windows platform build support
2015-08-18 04:37:09 +00:00
Dan Willemsen
05d97fe723
Merge "Remove legacy windows platform build support"
2015-08-18 04:31:07 +00:00
Dan Willemsen
014719fcfc
resolved conflicts for merge of 05fae7e0
to mnc-dr-dev-plus-aosp
...
Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e
2015-08-17 20:44:29 -07:00
Dan Willemsen
05fae7e0be
am e6510750
: Merge "Use repeatable timestamps"
...
* commit 'e65107508adbea88fcc1ec51dcf28d4216365753':
Use repeatable timestamps
2015-08-18 03:35:44 +00:00
Dan Willemsen
e65107508a
Merge "Use repeatable timestamps"
2015-08-18 03:30:11 +00:00
Ying Wang
d82b7b5594
am 808f0541
: am 77128117
: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
...
* commit '808f0541bba725c4fdc9d2b425a305eeeb024e39':
Set up dependency on ADDRESS_SANITIZER_LINKER
2015-08-18 00:19:00 +00:00
Ying Wang
808f0541bb
am 77128117
: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
...
* commit '77128117d8b7811b86ba89e963f8a96cc6c55a6b':
Set up dependency on ADDRESS_SANITIZER_LINKER
2015-08-18 00:11:11 +00:00
Ying Wang
77128117d8
Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
2015-08-18 00:06:52 +00:00
Ying Wang
a05e222368
Set up dependency on ADDRESS_SANITIZER_LINKER
...
Set up dependency on ADDRESS_SANITIZER_LINKER if address sanitizer is
enabled.
Bug: 22850550
Change-Id: I736fe1d4db9594edf9e82ae96e4631887881dfa5
2015-08-17 17:06:14 -07:00
Omari Stephens
b89679f0b8
am c10e65ac
: Merge "DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""" into mnc-ub-dev
...
* commit 'c10e65ac58064ee1595864c2db3c39e35f70944f':
DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""
2015-08-17 23:05:58 +00:00
Omari Stephens
c10e65ac58
Merge "DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""" into mnc-ub-dev
2015-08-17 22:59:25 +00:00
Dan Albert
cce8d98c6b
am 9496ef90
: am c0018b04
: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
...
* commit '9496ef903ff9402859ac82cc339708c15fcd30f6':
Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:46:49 +00:00
Dan Albert
9496ef903f
am c0018b04
: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
...
* commit 'c0018b04e984180122ab615d8dbea09a3230ef7f':
Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:39:25 +00:00
Dan Albert
c0018b04e9
Merge "Add BUILD(_HOST)?_FUZZ_TEST."
2015-08-17 22:32:58 +00:00
Dan Albert
36b6f0472f
Add BUILD(_HOST)?_FUZZ_TEST.
...
These are tests that use LLVM's libFuzzer for testing with a
sanitizer.
Bug: http://b/22850550
Change-Id: I6eeaff7877b7dd0c30f8910c6f27f5278b27a83d
2015-08-17 14:39:27 -07:00
Elliott Hughes
55011ceb3a
am a9a433bd
: am 648f2011
: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
...
* commit 'a9a433bdcde19b3262f5eab6f4ee59b88673ec07':
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
2015-08-17 20:38:43 +00:00
Elliott Hughes
a9a433bdcd
am 648f2011
: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
...
* commit '648f2011a6fcf1fcb4a67b5d49a1c9d29877bc17':
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
2015-08-17 20:31:52 +00:00
Dan Albert
0d7b6137f0
am 8d61be6c
: am f9b75b1b
: Merge "Don\'t filter on a non-existent variable."
...
* commit '8d61be6c781277ae3f5423c805092220a961b102':
Don't filter on a non-existent variable.
2015-08-17 20:28:05 +00:00
Elliott Hughes
648f2011a6
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
2015-08-17 20:25:36 +00:00
Dan Albert
8d61be6c78
am f9b75b1b
: Merge "Don\'t filter on a non-existent variable."
...
* commit 'f9b75b1b24d985c873e548d4fd7945a6cdd99323':
Don't filter on a non-existent variable.
2015-08-17 20:19:30 +00:00
Dan Albert
f9b75b1b24
Merge "Don't filter on a non-existent variable."
2015-08-17 20:16:01 +00:00
Elliott Hughes
6c124d217f
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
...
Change-Id: Iebca0c4eab975c4bebcd3658baefd85c51890db4
2015-08-17 12:37:37 -07:00
Dan Willemsen
145ae32069
Remove legacy windows platform build support
...
We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.
Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
2015-08-17 12:35:04 -07:00
Justin Klaassen
ae71306af6
Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dr-dev-plus-aosp
2015-08-17 18:37:32 +00:00
Tao Bao
02c87a01d9
am 3b409d56
: am dae6455c
: Merge "Add an option to include a full bootloader in incremental OTA."
...
* commit '3b409d56f4e142dd4afc7e11bbe4502123a46f31':
Add an option to include a full bootloader in incremental OTA.
2015-08-17 18:29:32 +00:00
Tao Bao
3b409d56f4
am dae6455c
: Merge "Add an option to include a full bootloader in incremental OTA."
...
* commit 'dae6455c95a30ec2742b54ce3c8a4a45b1aa65f2':
Add an option to include a full bootloader in incremental OTA.
2015-08-17 17:48:43 +00:00
Tao Bao
dae6455c95
Merge "Add an option to include a full bootloader in incremental OTA."
2015-08-17 17:38:01 +00:00
Dan Albert
1b2187d871
Don't filter on a non-existent variable.
...
This used to be used for aarch64
(https://android-review.googlesource.com/#/c/80126/ ), but has since
been removed and now does nothing. This was then reimplemented more
generally with my_illegal_flags
(https://android-review.googlesource.com/#/c/166405/ ). Drop
*GLOBAL_UNSUPPORTED_CFLAGS in favor of that.
Change-Id: I3347726dd92f9d3a16783e0d9d3b685a828400b4
2015-08-17 10:36:09 -07:00
leozwang
aa6c1a1445
Add an option to include a full bootloader in incremental OTA.
...
Bug: 23101469
Change-Id: Iac466b83f789f10d26e8d289dce766cf0d05148b
(cherry picked from commit c1324751e79b23a63ea494f4bc784446c8f32435)
2015-08-17 10:34:01 -07:00
Dirk Dougherty
a4f8444796
am 23a7114f
: am 3de73270
: am 8ea2636c
: am 6a8f88cd
: adjust image placement for m hero on medium screens.
...
* commit '23a7114fbb605d582a3451f522b9d1f6ec0b2741':
adjust image placement for m hero on medium screens.
2015-08-17 00:19:08 +00:00
Dirk Dougherty
23a7114fbb
am 3de73270
: am 8ea2636c
: am 6a8f88cd
: adjust image placement for m hero on medium screens.
...
* commit '3de7327062f452f3489e04aeb07b43efed32764f':
adjust image placement for m hero on medium screens.
2015-08-17 00:13:21 +00:00
Dirk Dougherty
3de7327062
am 8ea2636c
: am 6a8f88cd
: adjust image placement for m hero on medium screens.
...
* commit '8ea2636c190789263aaf78b89163c8e85bef3417':
adjust image placement for m hero on medium screens.
2015-08-17 00:06:12 +00:00
Dirk Dougherty
8ea2636c19
am 6a8f88cd
: adjust image placement for m hero on medium screens.
...
* commit '6a8f88cdec931470256ade35ffe6b8097425e36f':
adjust image placement for m hero on medium screens.
2015-08-16 23:57:48 +00:00
Dirk Dougherty
6a8f88cdec
adjust image placement for m hero on medium screens.
...
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
2015-08-14 21:19:22 -07:00
Stephen Hines
361d2d0f54
am 5d17a7e2
: am 2e08cb6e
: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
...
* commit '5d17a7e2adf505fd7a97782f54856c86a237369d':
Add -mfpu=neon-vfpv4 if cpu is krait
2015-08-15 02:19:08 +00:00
Yang Ni
5ed8b24fd4
am dcfb0c80
: am 36600a6b
: Merge "Include target api version in build system for rscpp."
...
* commit 'dcfb0c8018ec9e81fa79f3251a3d49a4cc90ddf4':
Include target api version in build system for rscpp.
2015-08-15 02:19:06 +00:00
Stephen Hines
5d17a7e2ad
am 2e08cb6e
: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
...
* commit '2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
Add -mfpu=neon-vfpv4 if cpu is krait
2015-08-15 02:12:46 +00:00
Stephen Hines
2e08cb6e1b
Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
2015-08-15 02:04:55 +00:00
Omari Stephens
bc171e3e40
DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""
...
This reverts commit 2d20e3d968
.
Bug: 22723877
Bug: 8440225
2015-08-14 18:51:25 -07:00
Yang Ni
dcfb0c8018
am 36600a6b
: Merge "Include target api version in build system for rscpp."
...
* commit '36600a6bf9b3b79327785cd740a909d3920d6519':
Include target api version in build system for rscpp.
2015-08-14 18:46:18 +00:00
Yang Ni
36600a6bf9
Merge "Include target api version in build system for rscpp."
2015-08-14 18:39:47 +00:00
Joe Fernandez
8e8a8d75b6
am e491aea7
: am 251d0ad1
: am a2869db8
: am 71e0a80c
: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
...
* commit 'e491aea79d8bfb2dafe8e6dc8af6f5a326617e0b':
doc change: Add hero image for m and css for landing pages.
2015-08-14 03:18:27 +00:00
Dan Albert
5256b245a9
am 5e9f4912
: am 578acca4
: Merge "Link librt on the host when using sanitizers."
...
* commit '5e9f491218721adecfab6ea0178cd1e4c6723a87':
Link librt on the host when using sanitizers.
2015-08-14 01:10:59 +00:00
Dan Albert
5e9f491218
am 578acca4
: Merge "Link librt on the host when using sanitizers."
...
* commit '578acca4e27511900eefc2f65be3e88f9127660c':
Link librt on the host when using sanitizers.
2015-08-14 01:05:03 +00:00
Dan Albert
578acca4e2
Merge "Link librt on the host when using sanitizers."
2015-08-14 00:59:52 +00:00
Dan Albert
2922411446
Link librt on the host when using sanitizers.
...
The sanitizers now use shared memory.
Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
2015-08-13 17:25:10 -07:00
Noah Presler
4796a8c524
Include target api version in build system for rscpp.
...
b/23161320
Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
2015-08-13 17:07:56 -07:00
Joe Fernandez
e491aea79d
am 251d0ad1
: am a2869db8
: am 71e0a80c
: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
...
* commit '251d0ad1914e958044ecbd7d9bad86d8e446ddd3':
doc change: Add hero image for m and css for landing pages.
2015-08-13 23:23:14 +00:00
Joe Fernandez
251d0ad191
am a2869db8
: am 71e0a80c
: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
...
* commit 'a2869db89eb59e57b7f0cdfc5e526d5257b95ecc':
doc change: Add hero image for m and css for landing pages.
2015-08-13 23:15:45 +00:00