Commit Graph

28554 Commits

Author SHA1 Message Date
Tianjie Xu 2c355a15be Merge "Adjust the size limit for splitting large files" into mnc-dr-dev
am: 7d55185

* commit '7d551850ddea337b2b35938012e0d13a38c6af65':
  Adjust the size limit for splitting large files
2016-03-24 17:19:42 +00:00
Tao Bao 7d551850dd Merge "Adjust the size limit for splitting large files" into mnc-dr-dev 2016-03-24 17:12:01 +00:00
Johan Redestig 8f800df5f0 Add libbase to otatools
build_verity_tree uses libbase since b104044.

Change-Id: I6d3406a107ceb6cd58d1a51aa79935209d4c435f
2016-03-24 14:17:51 +01:00
Andreas Gampe c5067415e4 Build: Provide default values for dexopt settings
am: 0647bcb

* commit '0647bcb8e5a768f162c144b185e896b8e50f4685':
  Build: Provide default values for dexopt settings
2016-03-24 02:07:15 +00:00
Dan Albert 45d7f57e09 Merge "Add support for multiple flavors of the NDK gtest."
am: cdc8f21

* commit 'cdc8f211804405e981ac0475150254fe7b493f62':
  Add support for multiple flavors of the NDK gtest.
2016-03-24 01:34:37 +00:00
Dan Albert 565f161363 Merge "Using stlport_static or c++_static requires libdl."
am: 2d3d14b

* commit '2d3d14b69bfc4e0c85ebc3266b22bf57e94adf64':
  Using stlport_static or c++_static requires libdl.
2016-03-24 01:34:37 +00:00
Dan Albert cdc8f21180 Merge "Add support for multiple flavors of the NDK gtest." 2016-03-24 01:26:09 +00:00
Dan Albert 2d3d14b69b Merge "Using stlport_static or c++_static requires libdl." 2016-03-24 01:26:09 +00:00
Alex Klyubin 284e45ac09 Fix bug in APK entry alignment.
APK entry alignment logic assumes that input entries have zero-length
comment and extra fields. When the assumption is broken, the logic
silently breaks alignment of output entries. This happens, for
example, when the APK to be signed is already aligned and thus may
contain entries with non-empty extra fields.

Given that APKs are not supposed to use comment and extra fields for
anything useful and given that this signer already discards comment
and extra fields of compressed entries, this change makes the signer
discard comment and extra fields of STORED input entries as well.
This unbreaks the existing alignment logic.

Bug: 27814973

(cherry picked from commit 37a0ecd329)

Change-Id: If2e0df6d3298e9736ef175bb0d9a05d450164c9f
2016-03-23 18:11:35 -07:00
Alex Klyubin 74a03e5008 Merge "Fix bug in APK entry alignment."
am: 7f4eade

* commit '7f4eadef7ed93c3cd2c68fcd4991142d075da2dd':
  Fix bug in APK entry alignment.
2016-03-24 01:05:11 +00:00
Alex Klyubin 7f4eadef7e Merge "Fix bug in APK entry alignment." 2016-03-24 00:59:01 +00:00
Tianjie Xu 083f65d66d Adjust the size limit for splitting large files
Modify the number of max blocks per transfer to reduce splitting of
large files during patch generation. This will reduce the size of
final incremental OTA updater package. In specific, the size limit
for each file to transfer is set to 1/8 cachesize instead of a fix
number.

Bug: 26472126

Change-Id: Iffb135e378c4c7a91640f2fc4c40e9e93d1fe4bb
(cherry picked from commit bb86e1d9c2)
2016-03-23 17:00:53 -07:00
Dan Willemsen 1e061d789a Merge "Remove ALL_PREBUILT, all users have been removed"
am: cfb5545

* commit 'cfb554566447b31cd045a5b67b960018418fe874':
  Remove ALL_PREBUILT, all users have been removed
2016-03-23 23:19:27 +00:00
Dan Willemsen cfb5545664 Merge "Remove ALL_PREBUILT, all users have been removed" 2016-03-23 23:12:46 +00:00
Ying Wang 9d13d6a7e9 Merge "Phony target covers all multilib variants."
am: 165c707

* commit '165c70713ac9099833df7fd6e6ba5c5620a84a9e':
  Phony target $(LOCAL_MODULE) covers all multilib variants.
2016-03-23 23:10:26 +00:00
Ying Wang 165c70713a Merge "Phony target $(LOCAL_MODULE) covers all multilib variants." 2016-03-23 23:04:54 +00:00
Andreas Gampe 0647bcb8e5 Build: Provide default values for dexopt settings
Provide default values for system properties used by the package
manager.

Bug: 27689078
Change-Id: Iedab0c0b1da6c905658546df7992f77fd6b55da1
2016-03-23 15:04:36 -07:00
Dan Willemsen 3006962257 Remove ALL_PREBUILT, all users have been removed
Change-Id: I37154506ef419e7a68ce7e2d864624d2ae53206f
2016-03-23 14:15:16 -07:00
Dan Albert b05cf54432 Add support for multiple flavors of the NDK gtest.
Since gtest depends on the STL, we need one version for each STL.

Bug: http://b/27801981
Change-Id: Id1a5571b043e2513d0184a9ab45a473dd545da84
2016-03-23 13:25:06 -07:00
Alex Klyubin 37a0ecd329 Fix bug in APK entry alignment.
APK entry alignment logic assumes that input entries have zero-length
comment and extra fields. When the assumption is broken, the logic
silently breaks alignment of output entries. This happens, for
example, when the APK to be signed is already aligned and thus may
contain entries with non-empty extra fields.

Given that APKs are not supposed to use comment and extra fields for
anything useful and given that this signer already discards comment
and extra fields of compressed entries, this change makes the signer
discard comment and extra fields of STORED input entries as well.
This unbreaks the existing alignment logic.

Bug: 27814973
Change-Id: I8242b037e21ba7bcf45d0fe2afc8bfc47f1ec314
2016-03-23 13:09:42 -07:00
Ying Wang 71c58092f4 Phony target $(LOCAL_MODULE) covers all multilib variants.
Bug: 27760875
Change-Id: Ie59e2c36964fa736b17fb4185563c08a8cb75b80
2016-03-23 11:02:03 -07:00
Ying Wang 7dee3625e0 Merge "Create empty .a on Darwin when there is no obj file."
am: 37aa85e

* commit '37aa85e8bb0d86cae946d85a27b6ded593c425b7':
  Create empty .a on Darwin when there is no obj file.
2016-03-23 16:56:20 +00:00
Ying Wang 37aa85e8bb Merge "Create empty .a on Darwin when there is no obj file." 2016-03-23 16:37:34 +00:00
Dan Willemsen cc60f01357 Handle symlinked OUT_DIRs (again)
My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.

This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.

Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:

 1) Soong generates out.angler/soong/Android.mk
 2) Kati's find generator produces in-memory tree of the filesystem
 3) $(shell ) creates out.angler/Android.mk
 4) The emulated findleaves Android.mk search finds
    out.angler/soong/Android.mk since the in-memory tree is never updated.

This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.

Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
2016-03-22 20:02:18 -07:00
Ying Wang 4aaa1a1fd8 Create empty .a on Darwin when there is no obj file.
On Darwin ar would fail if there is no object file to add.
We work around by adding a dummy.o to the .a and then deleting it.

Bug: 27800477
Change-Id: I68bbebea2726058c25863d7026a645a520d05167
2016-03-22 18:23:13 -07:00
Zach Jang 66211517cb Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684 am: f32d07d am: 0cf7987 am: ae7c301
am: 901590a

* commit '901590ae2aea651be1f5cc972674a3ba8d8ee430':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:14:09 +00:00
Zach Jang 901590ae2a Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684 am: f32d07d am: 0cf7987
am: ae7c301

* commit 'ae7c3010265171b2c215c5a30049320ba50265a7':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:10:42 +00:00
Zach Jang ae7c301026 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684 am: f32d07d
am: 0cf7987

* commit '0cf7987b7e96d2178fbb028e36992ffb1b589b38':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:07:14 +00:00
Zach Jang 0cf7987b7e Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684
am: f32d07d

* commit 'f32d07dd9328401525e333a34464a1d1f363e524':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:03:47 +00:00
Chih-Hung Hsieh af5606e50d Merge "Dump table of warning counts before all warnings."
am: 6d41f7e

* commit '6d41f7e1233da88714edaf3f21f88ff8023558f4':
  Dump table of warning counts before all warnings.
2016-03-23 01:00:51 +00:00
Chih-Hung Hsieh eb293f654e Merge "Add more patterns, dump sorted unique warnings."
am: 52ab1bc

* commit '52ab1bc17989f933ff4a73df82eeb1654d36d26d':
  Add more patterns, dump sorted unique warnings.
2016-03-23 01:00:51 +00:00
Zach Jang f32d07dd93 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea
am: 6bbd684

* commit '6bbd684464a1307f074e6c173a9147d6e2a626f1':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:00:15 +00:00
Zach Jang 6bbd684464 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483
am: 08d9bea

* commit '08d9bea41096f7c055cf67860a07436da6712b01':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:56:45 +00:00
Zach Jang 08d9bea410 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780
am: 274e483

* commit '274e48378f92c711d28876380f34e263159cb81b':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:53:20 +00:00
Zach Jang 274e48378f Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
am: 175b780

* commit '175b7800f484edceee404abf21973859d5793c0d':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:49:48 +00:00
Dan Albert a81e1b7fed Using stlport_static or c++_static requires libdl.
Why? For one, libgcc's unwinder makes use of `dl_iterate_phdr`. Also,
libgabi++ (the home grown C++ RT we use for stlport) uses
`dlopen` for liblog when reporting fatal errors. The LLVM unwinder
which is used by libc++ also uses libdl.

Requiring a dependency on libdl seems less objectionable than
requiring one on liblog. We could always change libgabi++ to  use
syslog instead, but that will only reach logcat for newer devices
(possibly L+, definitely M+).

Requiring libdl seems like the best option here, especially given
that libgcc needs it anyway.

Change-Id: I4acfaf38145c39fc15a76fbb282a46786e5322f1
2016-03-22 17:15:14 -07:00
smain@google.com 1a2e2076bf remove the \'refonly\' templates. no longer needed, as the standard templates now have conditions to handle the reference only design. bug: 27667787
am: 6405ed9

* commit '6405ed9d512dd07066e76d6db1cab4f73aa3c702':
  remove the 'refonly' templates. no longer needed, as the standard templates now have conditions to handle the reference only design. bug: 27667787
2016-03-22 23:17:30 +00:00
smain@google.com fc9c6f2859 add the \'reference only\' header design as a condition to the normal templates. also add override for implementation to the to-root link path. bug: 27667787
am: 9a12a2f

* commit '9a12a2f82fa74db6a32e7e99e33d1fc106a4db0c':
  add the 'reference only' header design as a condition to the normal templates. also add override for implementation to the to-root link path. bug: 27667787
2016-03-22 23:17:30 +00:00
smain@google.com 6405ed9d51 remove the 'refonly' templates.
no longer needed, as the standard templates now have conditions to handle the reference only design.
bug: 27667787

Change-Id: I7c627ad4cace0bb1c77c494b3052eca3c9609a5c
2016-03-22 16:00:34 -07:00
smain@google.com 9a12a2f82f add the 'reference only' header design as a condition to the normal templates.
also add override for implementation to the to-root link path.
bug: 27667787

Change-Id: I79892ddb7c5053d5325afcd50016c726b34e1361
2016-03-22 14:31:39 -07:00
Chih-hung Hsieh 6d41f7e123 Merge "Dump table of warning counts before all warnings." 2016-03-22 18:37:24 +00:00
Chih-Hung Hsieh a9be47e782 Dump table of warning counts before all warnings.
* The table of warning counts has links to each warning pattern section,
  which has a new anchor.
* Each warning pattern section has a new link to the 'top' of the table
  of warning counts.
* Background color of unknown warnings is changed to more visible light blue.

BUG: 27698849
Change-Id: Ia3d4a8511bd42f44f6a47afcb9c3889f6d62b9f2
2016-03-22 10:44:11 -07:00
Chih-hung Hsieh 52ab1bc179 Merge "Add more patterns, dump sorted unique warnings." 2016-03-22 17:33:19 +00:00
Chih-Hung Hsieh ba0ddcd099 Add more patterns, dump sorted unique warnings.
* Sort and remove duplicated warning messages.
* Recognize more warning message patterns from new clang compiler.

BUG: http://b/27698849

Change-Id: Iebbe8600353269d8c2d49ef9d97a72be1d978a24
2016-03-22 16:31:18 +00:00
Pierre Imai 77ad015d52 Merge "Remove references to deleted dhcpcd" into nyc-dev
am: 8111146

* commit '8111146ea3ef05fece0305df9c4247c40acbd93b':
  Remove references to deleted dhcpcd
2016-03-22 02:57:54 +00:00
Pierre Imai 8111146ea3 Merge "Remove references to deleted dhcpcd" into nyc-dev 2016-03-22 02:49:33 +00:00
Zach Jang a6b5a1da02 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625 am: d7bf980 am: 87582a8 am: 880e914
am: 6faa48a

* commit '6faa48a0b525d32d78f1f43a1dfd9e4c02104e42':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 01:55:31 +00:00
Zach Jang 6faa48a0b5 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625 am: d7bf980 am: 87582a8
am: 880e914

* commit '880e914ec6b8ce053ad5b766a2907afaf0c79673':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 01:03:01 +00:00
Zach Jang 880e914ec6 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625 am: d7bf980
am: 87582a8

* commit '87582a8758970cc1178c9c63a7e5f8d97b02aa5d':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:59:40 +00:00
Zach Jang 87582a8758 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625
am: d7bf980

* commit 'd7bf9800f4f5fdc83b2ffb163207025459b26b36':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:56:58 +00:00