Commit Graph

24282 Commits

Author SHA1 Message Date
Tao Bao 42a2b83c53 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:46:41 +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 8694cf75b6 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-19 01:40:09 +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 2cc00c305c 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 64c9868bea 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:40 +00:00
Ying Wang ac9b5af50f 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:39 +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 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 20c68b7494 am 5d690a37: am ab9a3588: Merge "Revise stash for BBOTAs when needed."
* commit '5d690a37d4b3b33dee1cfc2a64b66ed4e9c03460':
  Revise stash for BBOTAs when needed.
2015-08-18 17:25:09 +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 1b14846717 am 48d95e75: am 05d97fe7: Merge "Remove legacy windows platform build support"
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
  Remove legacy windows platform build support
2015-08-18 04:43:04 +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 9cf990beec resolved conflicts for merge of 05fae7e0 to mnc-dev-plus-aosp
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
2015-08-17 20:50:48 -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 f4ff2b119c 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:18:48 +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
Dan Albert c0ad316183 am 9496ef90: am c0018b04: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
* commit '9496ef903ff9402859ac82cc339708c15fcd30f6':
  Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:46:38 +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 7cbec69fbf 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:41 +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
Elliott Hughes 648f2011a6 Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build." 2015-08-17 20:25:36 +00:00
Dan Albert 401faa3513 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:24:05 +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 d4e119e92f Merge "Revert "Revert "Switch from Calculator to ExactCalculator""" into mnc-dev-plus-aosp 2015-08-17 18:36:57 +00:00
Tao Bao e3103ce2a5 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 17:55:34 +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
Tao Bao 82c47981bd Revise stash for BBOTAs when needed.
When generating incremental BBOTAs (v2 and above), we need to ensure
that the needed runtime stash is below the given threshold. If it's
running out of space on /cache, we replace the command that uses a
stash with a "new" command instead.

This may increase the OTA package size, since it is carrying more full
blocks instead of patches. It gets even worse for large files that span
a number of blocks, because currently we will store all the blocks for
the file as "new" blocks if stashing cannot be satisfied. We may further
optimize by splitting them into smaller chunks so that most of them can
still be stashed.

Bug: 22430577
Change-Id: I5a49e361adc7d3d41de2e9c08ee9b08c1e6c091a
2015-08-17 10:21:49 -07:00
Dirk Dougherty b92c45fb98 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 22:31:27 +00:00