Tao Bao
23bf2ba887
am 04ae3520
: am d88eaf02
: am 123a7d38
: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit '04ae3520a2e6cf44933a565fed6e478e60cdda9b':
build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 03:10:29 +00:00
Tao Bao
04ae3520a2
am d88eaf02
: am 123a7d38
: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit 'd88eaf025543c3e5360fb22f1d142133621b117e':
build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 02:47:48 +00:00
Tao Bao
d88eaf0255
am 123a7d38
: Merge "build: Don\'t call make_recovery_patch if there\'s no recovery."
...
* commit '123a7d380ee29941639a1fce10ba2051d37f860b':
build: Don't call make_recovery_patch if there's no recovery.
2015-08-19 02:39:21 +00:00
Tao Bao
123a7d380e
Merge "build: Don't call make_recovery_patch if there's no recovery."
2015-08-19 02:34:27 +00:00
Konstantinos Menychtas
2bbb6aa343
am 25067c4d
: am 3337d1eb
: am 58aacccb
: am 39b32b0d
: am 956e4693
: Increasing MIPS emulator system image size and user-data image size
...
* commit '25067c4dc379e96538e7c551ad5d094197765931':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 02:21:12 +00:00
Konstantinos Menychtas
25067c4dc3
am 3337d1eb
: am 58aacccb
: am 39b32b0d
: am 956e4693
: Increasing MIPS emulator system image size and user-data image size
...
* commit '3337d1eb298516a4dd8b43fdc4b00dcde29f3c32':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 01:42:32 +00:00
Konstantinos Menychtas
3337d1eb29
am 58aacccb
: am 39b32b0d
: am 956e4693
: Increasing MIPS emulator system image size and user-data image size
...
* commit '58aacccb2f491decb559a6c93abb35abcc64cfef':
Increasing MIPS emulator system image size and user-data image size
2015-08-19 01:31:21 +00:00
Tao Bao
cbc6dc29d6
build: Don't call make_recovery_patch if there's no recovery.
...
Change-Id: Iea1bd529eca9cd607da3b420bc4287f95c18219d
2015-08-18 18:28:47 -07:00
Chih-hung Hsieh
02d8af364b
am 35473f3d
: am 3eccd047
: am 59c858fc
: Merge "Remove special x86 flag that disables tail call optimization."
...
* commit '35473f3d12c79910787e5814f04ad99826246c3d':
Remove special x86 flag that disables tail call optimization.
2015-08-18 22:28:53 +00:00
Chih-hung Hsieh
35473f3d12
am 3eccd047
: am 59c858fc
: Merge "Remove special x86 flag that disables tail call optimization."
...
* commit '3eccd04784d4a92e224bf0e6917f9a3b0353da1d':
Remove special x86 flag that disables tail call optimization.
2015-08-18 22:22:23 +00:00
Chih-hung Hsieh
3eccd04784
am 59c858fc
: Merge "Remove special x86 flag that disables tail call optimization."
...
* commit '59c858fc94d4cf45a260da81176372ca2a4b77ef':
Remove special x86 flag that disables tail call optimization.
2015-08-18 22:17:31 +00:00
Chih-hung Hsieh
59c858fc94
Merge "Remove special x86 flag that disables tail call optimization."
2015-08-18 22:11:03 +00:00
Ying Wang
3f35767974
am 680fffec
: am 71327b90
: am 42fa1948
: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
...
* commit '680fffec50b1cc1c46aef7edfc780820da2fbf4b':
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
2015-08-18 21:58:09 +00:00
Ying Wang
9680738324
am e2bf8441
: am f526c169
: (-s ours) am c3dcb6c0
: Merge "Consolidate the nanopb-c and regular protobuf build rules."
...
* commit 'e2bf84415c185532109b979b3652311727d2325e':
Consolidate the nanopb-c and regular protobuf build rules.
2015-08-18 21:58:08 +00:00
Ying Wang
680fffec50
am 71327b90
: am 42fa1948
: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
...
* commit '71327b90d8b2c2f9b1b3c993dcb907f3a225a7b8':
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
2015-08-18 21:51:45 +00:00
Ying Wang
e2bf84415c
am f526c169
: (-s ours) am c3dcb6c0
: Merge "Consolidate the nanopb-c and regular protobuf build rules."
...
* commit 'f526c169efd3da99e2fa01d76e4efec0f2f4f36a':
Consolidate the nanopb-c and regular protobuf build rules.
2015-08-18 21:51:44 +00:00
Ying Wang
71327b90d8
am 42fa1948
: Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
...
* commit '42fa19482abbcebcb2ab563084b7ac1969553fe9':
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
2015-08-18 21:41:05 +00:00
Ying Wang
f526c169ef
am c3dcb6c0
: Merge "Consolidate the nanopb-c and regular protobuf build rules."
...
* commit 'c3dcb6c06bd2fbe816a918e9c3b099669bbeb5b5':
Consolidate the nanopb-c and regular protobuf build rules.
2015-08-18 21:41:03 +00:00
Ying Wang
42fa19482a
Merge "Rename libnanopb-c-2.8.0 to libprotobuf-c-nano."
2015-08-18 21:35:42 +00:00
Ying Wang
c3dcb6c06b
Merge "Consolidate the nanopb-c and regular protobuf build rules."
2015-08-18 21:35:37 +00:00
Ying Wang
f050c2f1c7
Rename libnanopb-c-2.8.0 to libprotobuf-c-nano.
...
Bug: 20093047
Change-Id: I787925fde97d1a3965cb8a9bf012f3c5a45a6aed
2015-08-18 14:32:07 -07:00
Ying Wang
b28ed234aa
Consolidate the nanopb-c and regular protobuf build rules.
...
Bug: 20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
2015-08-18 14:27:45 -07:00
Konstantinos Menychtas
58aacccb2f
am 39b32b0d
: am 956e4693
: Increasing MIPS emulator system image size and user-data image size
...
* commit '39b32b0d1f0e016ee99830e5ef4c165a7e0576ce':
Increasing MIPS emulator system image size and user-data image size
2015-08-18 18:35:07 +00:00
Konstantinos Menychtas
39b32b0d1f
am 956e4693
: Increasing MIPS emulator system image size and user-data image size
...
* commit '956e469327b1da4b635f20795ed48f6c36ba10d6':
Increasing MIPS emulator system image size and user-data image size
2015-08-18 18:28:45 +00:00
Tao Bao
60ccef50cd
am 5e88f021
: am 5d690a37
: am ab9a3588
: Merge "Revise stash for BBOTAs when needed."
...
* commit '5e88f021cf30d7b38addf54f7177a6ade5a502f7':
Revise stash for BBOTAs when needed.
2015-08-18 17:35:45 +00:00
Konstantinos Menychtas
956e469327
Increasing MIPS emulator system image size and user-data image size
...
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
2015-08-18 17:34:09 +00:00
Tao Bao
5e88f021cf
am 5d690a37
: am ab9a3588
: Merge "Revise stash for BBOTAs when needed."
...
* commit '5d690a37d4b3b33dee1cfc2a64b66ed4e9c03460':
Revise stash for BBOTAs when needed.
2015-08-18 17:25:34 +00:00
Tao Bao
5d690a37d4
am ab9a3588
: Merge "Revise stash for BBOTAs when needed."
...
* commit 'ab9a3588011ebe62eb18e425de02a50fe919b645':
Revise stash for BBOTAs when needed.
2015-08-18 17:21:09 +00:00
Tao Bao
ab9a358801
Merge "Revise stash for BBOTAs when needed."
2015-08-18 16:59:05 +00:00
Dan Willemsen
bb410f4c45
am 6d65635e
: am 48d95e75
: am 05d97fe7
: Merge "Remove legacy windows platform build support"
...
* commit '6d65635ef70186edae65cd7a7b56f885fbddd3bc':
Remove legacy windows platform build support
2015-08-18 04:49:30 +00:00
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
dd122b1ea2
am 014719fc
: resolved conflicts for merge of 05fae7e0
to mnc-dr-dev-plus-aosp
...
* commit '014719fcfc240910fa216c39826b95d712468183':
Use repeatable timestamps
2015-08-18 04:15:47 +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
57d78cda18
am d82b7b55
: am 808f0541
: am 77128117
: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
...
* commit 'd82b7b55948739c0267333d6e0325526f5e07882':
Set up dependency on ADDRESS_SANITIZER_LINKER
2015-08-18 00:29:22 +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
401765009d
am b89679f0
: (-s ours) 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 'b89679f0b81adf6e12482ea5337f3148692be1f7':
DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""
2015-08-17 23:16:04 +00: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
2e4fa4baf8
am cce8d98c
: am 9496ef90
: am c0018b04
: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
...
* commit 'cce8d98c6bd5da5a584e69c348550cde6a065b8d':
Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:55:28 +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