Adam Seaton
a234c54e2a
Updating security string to 2016-09-05 in preparation for 2016 September
...
OTA for b/30224278
Change-Id: I055d0cc3a1a5f640dabf7a404c70c317e57959ca
2016-07-28 14:09:57 -07:00
Tao Bao
54a3234ca0
Handle multiple APKs from the same package in check_target_files_signatures.py.
...
am: 1a75fa6493
Change-Id: I9d8395624ee503adc293520a004da3bc9eb46090
2016-07-28 16:08:55 +00:00
Tao Bao
1a75fa6493
Handle multiple APKs from the same package in check_target_files_signatures.py.
...
We were using the package name as the key to index APKs. APKs from the
same package got messed up and gave wrong signature summary. Switch to
using the package filename as the key, which is identical in a given build.
Also fix the trailing space when printing the signature summary.
Bug: 30418268
Test: Run with a target_files.zip that has multiple APKs from the same package.
Change-Id: I6317e8c05e987c5690915e05c294153d10e2f0ab
(cherry picked from commit 6a54299fbd
)
2016-07-27 21:30:16 -07:00
Zach Jang
a212b9c250
Merge \\\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\\" into mnc-dev am: cb4ba4c90c
am: 942c341ab1
am: 37688e09fb
am: bf8d3a2105
...
am: 37c17db1c6
Change-Id: Ia894b80e649552407714a685c2c33082204fb474
2016-07-21 15:27:58 +00:00
Zach Jang
ea8bae7ef7
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
am: c8b3df9fb8
am: 46a86bf9d5
am: 984987506a
am: 2c64061e72
-s ours am: f1be3289ff
am: f1ee7d660f
am: d3d24134a6
am: f94bec3382
...
am: d1dae843e3
Change-Id: I072ee0a99b35aab5b6f7c30335da6f4c211b331a
2016-07-21 15:27:57 +00:00
Claes Elgemark
3bc451f114
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053
am: 160e0054dd
am: 96e784eb4a
-s ours
...
am: f8f74bafd2
Change-Id: I8777c82581d0ba08117c4bc50a6b78b626a81524
2016-07-21 15:27:56 +00:00
Zach Jang
37c17db1c6
Merge \\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\" into mnc-dev am: cb4ba4c90c
am: 942c341ab1
am: 37688e09fb
...
am: bf8d3a2105
Change-Id: I92f956bcbd342f0fa953fed5ffb6d1462bbe3c4c
2016-07-21 15:21:00 +00:00
Zach Jang
d1dae843e3
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
am: c8b3df9fb8
am: 46a86bf9d5
am: 984987506a
am: 2c64061e72
-s ours am: f1be3289ff
am: f1ee7d660f
am: d3d24134a6
...
am: f94bec3382
Change-Id: I1509caa4109a7ea93f179e7d640e554f0cd96b74
2016-07-21 15:20:59 +00:00
Claes Elgemark
f8f74bafd2
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053
am: 160e0054dd
...
am: 96e784eb4a
-s ours
Change-Id: I95310c02d97efd4331e0cb0f759ec26b8b403edb
2016-07-21 15:20:59 +00:00
Zach Jang
bf8d3a2105
Merge \\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\" into mnc-dev am: cb4ba4c90c
am: 942c341ab1
...
am: 37688e09fb
Change-Id: I9c13a7d9f2ab8d96faaea5501131dd3b248fcf91
2016-07-20 18:20:19 +00:00
Zach Jang
37688e09fb
Merge \\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\" into mnc-dev am: cb4ba4c90c
...
am: 942c341ab1
Change-Id: I29c8fae334dbd8f7d8a94dfa9dcf69c77aa18103
2016-07-20 18:17:18 +00:00
Zach Jang
f94bec3382
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
am: c8b3df9fb8
am: 46a86bf9d5
am: 984987506a
am: 2c64061e72
-s ours am: f1be3289ff
am: f1ee7d660f
...
am: d3d24134a6
Change-Id: Ia90d6d102d9036529742f9491bd1c6ae56d3f8f8
2016-07-20 18:17:18 +00:00
Zach Jang
942c341ab1
Merge \"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\" into mnc-dev
...
am: cb4ba4c90c
Change-Id: I7d4110e803b2775a4009c5adf1d249f98a2d0fa3
2016-07-20 18:14:48 +00:00
Zach Jang
d3d24134a6
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
am: c8b3df9fb8
am: 46a86bf9d5
am: 984987506a
am: 2c64061e72
-s ours am: f1be3289ff
...
am: f1ee7d660f
Change-Id: I18f7a195e607860043eeb0bc5ef4ee28ec8325a1
2016-07-20 18:14:48 +00:00
Zach Jang
f1ee7d660f
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
am: c8b3df9fb8
am: 46a86bf9d5
am: 984987506a
am: 2c64061e72
-s ours
...
am: f1be3289ff
Change-Id: I6f093b1be27f18d1d3aea0c44c031cf6c0d67d2d
2016-07-20 18:11:18 +00:00
Zach Jang
cb4ba4c90c
Merge "Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA" into mnc-dev
2016-07-20 18:09:45 +00:00
Zach Jang
f1be3289ff
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
am: c8b3df9fb8
am: 46a86bf9d5
am: 984987506a
...
am: 2c64061e72
-s ours
Change-Id: I134b3a61251b175b01c21ee11997cf85e131308f
2016-07-20 18:08:46 +00:00
Zach Jang
ee6b57f523
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
...
b/30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
2016-07-20 11:06:19 -07:00
Claes Elgemark
96e784eb4a
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053
...
am: 160e0054dd
Change-Id: I9851d5d1fc397191a35b6ab85cdf66b5bd222ff7
2016-07-20 17:47:41 +00:00
Claes Elgemark
160e0054dd
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
...
am: 687c266053
Change-Id: I5531a0fa456311f2a4824c7a9cdb5e3f43461da0
2016-07-20 17:44:42 +00:00
Claes Elgemark
687c266053
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
...
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.
Bug: 30222185
Bug: 30249120
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
(cherry picked from commit ec99604b07
)
2016-07-20 10:30:03 -07:00
Zach Jang
2c64061e72
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
am: c8b3df9fb8
am: 46a86bf9d5
...
am: 984987506a
Change-Id: Icce72413eaf703145c4e0478926839476df79588
2016-07-20 01:14:11 +00:00
Zach Jang
984987506a
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
am: c8b3df9fb8
...
am: 46a86bf9d5
Change-Id: If879ae7d694caa588554628a4fff3558009aa694
2016-07-20 01:10:46 +00:00
Zach Jang
46a86bf9d5
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
am: d46066851f
...
am: c8b3df9fb8
Change-Id: Ie46aa33c4d927bed0024887c3ef59f45f516e3f9
2016-07-20 01:08:10 +00:00
Zach Jang
c8b3df9fb8
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
am: 5e9c40c879
...
am: d46066851f
Change-Id: Ibfe7fbdbfa81f053a5dd4082a8ebb403e7c57930
2016-07-20 01:05:41 +00:00
Zach Jang
d46066851f
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am: 4d7c3a4c0d
...
am: 5e9c40c879
Change-Id: I8405b34a45cf8d0a0dc16bfc6b216f5c66b7f6ba
2016-07-20 01:02:41 +00:00
Zach Jang
5e9c40c879
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
...
am: 4d7c3a4c0d
Change-Id: I848cd6c2068f54c54a53dc5d0bb35c54fc7eb23f
2016-07-20 01:00:09 +00:00
Zach Jang
4d7c3a4c0d
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
...
b/30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
2016-07-19 13:20:45 -07:00
Kirill Grouchnikov
3f06eba6ea
Rename the source of core-utils module to core-utils
...
Change-Id: Ia2db5386ca0048ed70a310a9b13e074d2fedd0a7
(cherry picked from commit 73b833b6a5d9b03c460ec61c5d781c032d6dbe1f)
2016-07-18 21:16:54 +00:00
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