Commit Graph

28605 Commits

Author SHA1 Message Date
Tianjie Xu
333df6c1d1 Merge "Add care_map to target_files package" into nyc-mr1-dev 2016-07-11 17:59:47 +00:00
Tianjie Xu
cfa86223d6 Add care_map to target_files package
Generate a new file containing care_data of system (and vendor)
partition, and add it under META/ of target file package. For
A/B update, copy this file to OTA package for later use by
update_verifier.

Bug: 27175949

Change-Id: I90bb972703afaeb94bc3efe718fd81b1cfbcabcc
2016-07-08 16:53:59 -07:00
Tao Bao
0821fab13a Merge "releasetools: Fix the payload public key replacement." into nyc-mr1-dev 2016-07-08 19:47:10 +00:00
Tao Bao
f8acad1480 releasetools: Fix the detection of using squashfs.
We should disable using imgdiff if *any* of the source and target
partitions uses squashfs.

Bug: 30004734
Test: Create an incremental with two builds with one of them uses squashfs.
Change-Id: I826cd13d7b852c548e4b45e61f5ae00f6407cac3
2016-07-07 09:10:25 -07:00
Tao Bao
afaf295cb8 releasetools: Fix the payload public key replacement.
update_engine expects the extracted public key instead of the
certificate.

Bug: 28701652
Change-Id: I292d39da9e039f96d01a4214226aeb46f8cb881d
2016-07-06 15:31:36 -07:00
Ian Pedowitz
14c2a1586b Merge "Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""" into nyc-mr1-dev 2016-07-06 18:46:24 +00:00
Ian Pedowitz
3b54683924 Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""
This reverts commit 266600b639.

Bug: 29117805
Change-Id: Idfc80ee1a91f76088c59a2ebe29a3d96bf02bf03
2016-07-05 18:25:14 +00:00
Alan Viverette
d2fc8094b1 Update pathmap.mk for refactored support library
Fix build following fast-forward of support library branch.

Change-Id: Ib9701b6f31f5b4a18067380875b145d990a07dd3
2016-07-02 19:40:37 -04:00
David Friedman
17e29c2037 Merge \"Docs: Adding info in support of TOC for new Performance section.\" into nyc-dev
am: 77a4215191

Change-Id: If71aa4f05bd7d0f732cf91c1835db95ffab47b64
2016-07-01 22:42:03 +00:00
Joe Fernandez
77a4215191 Merge "Docs: Adding info in support of TOC for new Performance section." into nyc-dev 2016-07-01 22:18:19 +00:00
Michael Wright
bcdc880ca9 N MR1 is API 25
Bug: 29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
2016-07-01 14:42:44 +01:00
Andreas Gampe
5ed27e2d2f Build: Fix vendor sanitizer library for secondary arch
Fix the directory for secondary-architecture libraries under
sanitization. These incorrectly wrote into vendor/lib instead
of data/vendor/lib.

Bug: 29498013

(cherry picked from commit cf6268f471)

Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
2016-06-30 20:49:55 -07:00
Alex Light
3f7c34859e Merge "Add system_other partition, install odex files" into nyc-mr1-dev 2016-06-29 20:26:06 +00:00
TreeHugger Robot
bfbcc0e954 Merge "Extract prebuilt APKs from zip files" into nyc-mr1-dev 2016-06-29 20:25:43 +00:00
Badhri Jagan Sridharan
00046ad56e Merge "Add build variant to kernel command line" into nyc-mr1-dev 2016-06-28 21:30:14 +00:00
Allen Hair
49fd8a24f3 Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am: 1f44c26b1e

Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216
2016-06-28 17:53:00 +00:00
Allen Hair
1f44c26b1e Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev 2016-06-28 17:45:17 +00:00
Allen Hair
ca96e25c5b DO NOT MERGE Skip emma instrumentation if we're using jack.
Bug: 29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f
2016-06-27 17:21:48 -07:00
David Friedman
e0b9229915 Docs: Adding info in support of TOC for new Performance section.
Bug:
Change-Id: Iad34b8d3294ddea714c8933a60fb2615811ac019
2016-06-27 16:40:20 -07:00
Andreas Gampe
bb5454b6db Build: Add module-level product configuration of sanitization
To allow special sanitizer settings for modules shared between
products, add product-specific module settings.

This was copied from the product-specific dexopt settings.

Bug: 29498013
Change-Id: I17a96b975bb6ac7f4ffb3d5b08e2f00b21bd97a1
2016-06-27 15:15:31 -07:00
Dan Sandler
e4224c46cb Merge \"The easter egg is now its own APK.\" into nyc-dev
am: 18ecea3986

Change-Id: Ica7456ab7bf01dba0f294fce3720b0e19db02f38
2016-06-26 22:56:03 +00:00
Ian Pedowitz
18ecea3986 Merge "The easter egg is now its own APK." into nyc-dev 2016-06-26 22:50:46 +00:00
Dan Sandler
26c4ef4c65 The easter egg is now its own APK.
It should be included wherever SystemUI is.

Bug: 27376882
Change-Id: Ibe2688c86e58bdfb8a5278c9c4939d7cdb524078
2016-06-26 18:07:59 +00:00
Alex Light
4e358ab2c3 Add system_other partition, install odex files
For AB devices, support flashing two system partitions for factory use.
The normal system image on one partition, but without dex preopt. And a
system_other image that just contains the odex files. The dex files will
not be stripped out of the system image, in case the second system
partition is wiped.

Setting BOARD_USES_SYSTEM_OTHER_ODEX := true in the BoardConfig.mk
enables this behavior.

One can control which directories are placed in system_other by the
SYSTEM_OTHER_ODEX_FILTER configuration variable. Currently we default
to only copying only app and priv-app odexs.

Bug: 29278988
Change-Id: I7f4e87da919e7dc6a89fd8c668193cd4e98631bc
2016-06-24 11:07:15 -07:00
Tianjie Xu
21e6dde63c Merge "Avoid writing too much new data per transfer" into nyc-mr1-dev 2016-06-24 18:06:22 +00:00
Ian Pedowitz
47383ac698 Merge "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""" into nyc-mr1-dev 2016-06-24 17:53:00 +00:00
Ian Pedowitz
266600b639 Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""
This reverts commit 369efe3d84.

Bug: 29117805
Bug: 28809789
Bug: 29621988
Change-Id: Icd9e01d4cbd3f769237702f5df287eb61c7527cd
2016-06-24 17:52:29 +00:00
Tao Bao
5fdbfac337 Merge "Fix the path for verity_key replacement when signing." into nyc-mr1-dev 2016-06-24 04:54:20 +00:00
Daniel Micay
f46b7b2d77 resolve merge conflicts of 012144f to nyc-dev
am: bb9a8d8eb8

Change-Id: I98ae278400ca59a342a1cc5fe751f0e911795003
2016-06-24 03:40:22 +00:00
Tianjie Xu
37e29301e6 Avoid writing too much new data per transfer
Limit the number of blocks in each 'new' command to 1024. This should
decrease the chance of fsync error during an OTA update, similiar to
what we have done in b/29535618.

Bug: 29607757
Change-Id: I89f0a845d71eb810766e39860ab667c61b61a417
2016-06-23 18:00:16 -07:00
Tao Bao
e0ee794fa1 Fix the path for verity_key replacement when signing.
system_root_image expects the key at ROOT/verity_key as opposed to
BOOT/verity_key. Also refactor the verity key replacement lines.

Bug: 29397395
Test: 'sign_target_files_apks.py --replace_verity_private_key newkey --replace_verity_public_key newkey.pub target_files.zip signed-target_files.zip' and verify the replaced key in boot.img.
Change-Id: I58a5defff4be008ad55d4b5a5b7148569c3b8d66
2016-06-23 16:23:14 -07:00
Jeff Vander Stoep
bb9a8d8eb8 resolve merge conflicts of 012144f to nyc-dev
Change-Id: If918f56d5c33db10978b4efc51cf3fe42ed71f1a
2016-06-23 15:04:24 -07:00
Ian Pedowitz
7b352c1d70 Merge "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""" into nyc-mr1-dev 2016-06-23 22:00:24 +00:00
Roozbeh Pournader
9b6ce7bf0d Merge "Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]" into nyc-mr1-dev 2016-06-23 21:52:35 +00:00
Daniel Micay
012144fc09 Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into mnc-dev am: 11c84f95fb am: a0c61fc832
am: 3cceebf11e

Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5
2016-06-23 21:10:35 +00:00
Jeffrey Vander Stoep
3cceebf11e Merge \\"disable unpriv perf by default in user{,debug} builds\\" into mnc-dev am: 11c84f95fb
am: a0c61fc832

Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
2016-06-23 21:07:28 +00:00
Daniel Micay
a0c61fc832 Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am: 11c84f95fb

Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
2016-06-23 21:04:53 +00:00
Jeffrey Vander Stoep
11c84f95fb Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev 2016-06-23 21:00:04 +00:00
Roozbeh Pournader
34247cfda3 Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]
This reverts commit 4c6e1b62e0, since sr-Latn is no longer planned for MR1.

Bug: 29455508
Bug: 29601930
Change-Id: I47c240fa7456940ecb272f05e94f563b221c92c3
2016-06-23 20:03:44 +00:00
Ian Pedowitz
369efe3d84 Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""
This reverts commit dc15ebc26c.

Fixes: 29117805
Bug: 28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
2016-06-23 19:09:46 +00:00
Baligh Uddin
2abbbd0333 Add ability to pass in payload_signer args
Bug: 28701652
Change-Id: I110d5fc14446e4a6a0f8e25dcb0d300decdf09a4
2016-06-23 10:34:51 -07:00
TreeHugger Robot
fbe2eedb28 Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev
* changes:
  Build: Add option to restrict sanitization by owner
  Build: Add option to restrict sanitization by architecture
2016-06-23 02:30:21 +00:00
Andreas Gampe
ea38d8e95d Build: Add option to restrict sanitization by owner
Add Make variable SANITIZE_NEVER_BY_OWNER to selectively
sanitize modules. By default, both are being sanitized. The
value of the variable is interpreted as a space or colon
separated list of owner names.

This can be used to create builds that lower the sanitization
burden by not sanitizing parts of the platform.

Bug: 29498013
Change-Id: Ib4412657fd38ff28a5c0863eddc2acde63c88ebb
2016-06-22 17:33:51 -07:00
Daniel Nishi
36ae59228c Merge "Add the StorageManager APK to the core build." into nyc-mr1-dev 2016-06-22 23:50:07 +00:00
Dan Willemsen
048f56dfce Extract prebuilt APKs from zip files
Since APKs are zip files, embedded APKs in other APKs can be extracted,
installed, then optimized.

DPI-based filenames can be used if LOCAL_DPI_VARIANTS is set.

Bug: 29179775
Change-Id: Iab6388111522114ce9dc07057d59e3a89394cd6f
2016-06-22 14:25:53 -07:00
Badhri Jagan Sridharan
05dcc3718a Merge "releasetools: replace verity keyid" into nyc-mr1-dev 2016-06-22 20:54:21 +00:00
Tianjie Xu
9eb3260239 Merge \"Limit the number of blocks in command zero\" into nyc-dev
am: 0eade3f027

Change-Id: I56afbc6fed2d79d2ab71a35577739c96d779de6e
2016-06-22 05:17:40 +00:00
Tianjie Xu
0eade3f027 Merge "Limit the number of blocks in command zero" into nyc-dev 2016-06-22 05:11:24 +00:00
Zach Jang
113239bed6 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db am: 1be6c69524
am: 1f87a820ad

Change-Id: I7fa8b6b8fc732a24d3c058d02a5568abab52028b
2016-06-22 01:46:17 +00:00
Zach Jang
1f87a820ad resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db
am: 1be6c69524

Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
2016-06-22 01:43:47 +00:00