OSDN Git Service
Allen Hair [Tue, 28 Jun 2016 18:25:39 +0000 (18:25 +0000)]
Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am:
1f44c26b1e
am:
49fd8a24f3 -s ours
Change-Id: I9a51bcb269dc9554e1389a00cf75b95f9bb6bbe6
Allen Hair [Tue, 28 Jun 2016 17:53:00 +0000 (17:53 +0000)]
Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am:
1f44c26b1e
Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216
Allen Hair [Tue, 28 Jun 2016 17:45:17 +0000 (17:45 +0000)]
Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev
Hung-ying Tyan [Tue, 28 Jun 2016 06:27:13 +0000 (06:27 +0000)]
Merge \\\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\\" am:
2acb2d5bcf am:
200da242a5
am:
00e23a1d8f
Change-Id: Ibf7c1fdeb9994b7c12ac3dd2fa8d8dec53b7d276
Hung-ying Tyan [Tue, 28 Jun 2016 06:24:48 +0000 (06:24 +0000)]
Merge \\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\" am:
2acb2d5bcf
am:
200da242a5
Change-Id: I93d1b301c23265e783e68de5e066606764b90ffc
Hung-ying Tyan [Tue, 28 Jun 2016 06:22:17 +0000 (06:22 +0000)]
Merge \"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\"
am:
2acb2d5bcf
Change-Id: I3c151949bcc6b8d75f2c46619b6ce38561084338
Treehugger Robot [Tue, 28 Jun 2016 06:17:32 +0000 (06:17 +0000)]
Merge "Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES"
Hung-ying Tyan [Fri, 20 May 2016 11:08:30 +0000 (19:08 +0800)]
Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES
Allow exceptions specified by module (VENDOR_EXCEPTION_MODULES) and
path (VENDOR_EXCEPTION_PATHS, not including leading vendor/).
BUG=
26968426
Change-Id: I068e43f3eae14f8793c33ae916d46979ab1681d1
Ethan Xia [Tue, 28 Jun 2016 02:02:12 +0000 (02:02 +0000)]
Merge \\\"releasetools: Change the default key path for bvbtool\\\" am:
7c7571d510 am:
090e8eff5e
am:
e4efe69fae
Change-Id: If1d96c88a42d3894d7c9bccef6064f159bf185d2
Ethan Xia [Tue, 28 Jun 2016 01:59:47 +0000 (01:59 +0000)]
Merge \\"releasetools: Change the default key path for bvbtool\\" am:
7c7571d510
am:
090e8eff5e
Change-Id: I34f3cc1a38b860fd3100548f55a38af9faf69e19
Ethan Xia [Tue, 28 Jun 2016 01:57:26 +0000 (01:57 +0000)]
Merge \"releasetools: Change the default key path for bvbtool\"
am:
7c7571d510
Change-Id: Ic02f432c689edba37ecce684662d8f5f1cfc32b6
Treehugger Robot [Tue, 28 Jun 2016 01:52:36 +0000 (01:52 +0000)]
Merge "releasetools: Change the default key path for bvbtool"
Andreas Gampe [Tue, 28 Jun 2016 00:38:26 +0000 (00:38 +0000)]
Build: Add module-level product configuration of sanitization
am:
bb5454b6db
Change-Id: I03c598091f51e179d278bfabaf3345f3cccc45d6
Allen Hair [Mon, 27 Jun 2016 19:32:50 +0000 (12:32 -0700)]
DO NOT MERGE Skip emma instrumentation if we're using jack.
Bug:
29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f
Andreas Gampe [Mon, 27 Jun 2016 22:15:31 +0000 (15:15 -0700)]
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
Ethan Xia [Mon, 27 Jun 2016 09:19:01 +0000 (17:19 +0800)]
releasetools: Change the default key path for bvbtool
The bvb path has been changed from 'system/bvb' to 'external/bvb'
Change-Id: I8587351b7d702a287883c6bd3c9de1cd3540435b
Ian Pedowitz [Sun, 26 Jun 2016 23:07:35 +0000 (23:07 +0000)]
Merge \\"The easter egg is now its own APK.\\" into nyc-dev am:
18ecea3986
am:
e4224c46cb
Change-Id: I7d05801270e0a938048a5f2fc505e3cd8630a42d
Ian Pedowitz [Sun, 26 Jun 2016 23:03:00 +0000 (23:03 +0000)]
Merge \\"The easter egg is now its own APK.\\" into nyc-dev am:
18ecea3986
am:
377d5bdb3f
Change-Id: I11f7501dcf768397acc4cfc74eee58d27013b6a4
Dan Sandler [Sun, 26 Jun 2016 22:56:05 +0000 (22:56 +0000)]
Merge \"The easter egg is now its own APK.\" into nyc-dev
am:
18ecea3986
Change-Id: I4712931d6e73ecb08dae76b77ad12585a914882b
Dan Sandler [Sun, 26 Jun 2016 22:56:03 +0000 (22:56 +0000)]
Merge \"The easter egg is now its own APK.\" into nyc-dev
am:
18ecea3986
Change-Id: Ica7456ab7bf01dba0f294fce3720b0e19db02f38
Ian Pedowitz [Sun, 26 Jun 2016 22:50:44 +0000 (22:50 +0000)]
Merge "The easter egg is now its own APK." into nyc-dev
Dan Sandler [Sat, 25 Jun 2016 14:54:39 +0000 (10:54 -0400)]
The easter egg is now its own APK.
It should be included wherever SystemUI is.
Bug:
27376882
Change-Id: Ibe2688c86e58bdfb8a5278c9c4939d7cdb524078
Christopher Wiley [Fri, 24 Jun 2016 21:34:33 +0000 (21:34 +0000)]
Merge \\\"Fix typo in setting PRIVATE_MODULE for AIDL source\\\" am:
05038d84dc am:
2ee4f68d38
am:
28db78a499
Change-Id: I2f87f686a2083c12faa087b4601ff81f5936cea7
Christopher Wiley [Fri, 24 Jun 2016 21:32:07 +0000 (21:32 +0000)]
Merge \\"Fix typo in setting PRIVATE_MODULE for AIDL source\\" am:
05038d84dc
am:
2ee4f68d38
Change-Id: Ifd141422ed041b077ba1f3c098b85b8d93feda42
Christopher Wiley [Fri, 24 Jun 2016 21:29:55 +0000 (21:29 +0000)]
Merge \"Fix typo in setting PRIVATE_MODULE for AIDL source\"
am:
05038d84dc
Change-Id: I3fb16f448c48e9e14fb4e7080c2955c3d38c6d11
Treehugger Robot [Fri, 24 Jun 2016 21:16:23 +0000 (21:16 +0000)]
Merge "Fix typo in setting PRIVATE_MODULE for AIDL source"
Christopher Wiley [Fri, 24 Jun 2016 20:13:52 +0000 (13:13 -0700)]
Fix typo in setting PRIVATE_MODULE for AIDL source
Bug:
29619260
Change-Id: I59f883c1a92075800844cc2a77b307782a9ab800
Chih-Hung Hsieh [Fri, 24 Jun 2016 18:21:46 +0000 (18:21 +0000)]
Merge \\\"Add +/- buttons to expand/collapse warning categories.\\\" am:
4837ce8ca6 am:
320d126394
am:
a612b58464
Change-Id: I3b1bc8ad038e92c2fec7029f2ecc526629424ae2
David Sehr [Fri, 24 Jun 2016 18:21:45 +0000 (18:21 +0000)]
Merge \\\"Filter logging from dexdump/dex2oat to errors only\\\" am:
be6b4fc1b3 am:
5efb73504d
am:
0aa5ad21f1
Change-Id: Ifd4960cce511b284fc11661d23f78a4476a42a47
Chih-hung Hsieh [Fri, 24 Jun 2016 18:17:05 +0000 (18:17 +0000)]
Merge \\"Add +/- buttons to expand/collapse warning categories.\\" am:
4837ce8ca6
am:
320d126394
Change-Id: I637c546da197a7d9cc6b1ea91dc6f45f51f7ecda
David Sehr [Fri, 24 Jun 2016 18:17:04 +0000 (18:17 +0000)]
Merge \\"Filter logging from dexdump/dex2oat to errors only\\" am:
be6b4fc1b3
am:
5efb73504d
Change-Id: I3a39624a5ce329f67c30ce71b00f685abd14f569
Tianjie Xu [Fri, 24 Jun 2016 18:12:13 +0000 (18:12 +0000)]
Merge \"Avoid writing too much new data per transfer\" into nyc-mr1-dev
am:
21e6dde63c
Change-Id: I4d9fae702e81cea01a0a602247e629e71dd4efc7
Chih-Hung Hsieh [Fri, 24 Jun 2016 18:12:10 +0000 (18:12 +0000)]
Merge \"Add +/- buttons to expand/collapse warning categories.\"
am:
4837ce8ca6
Change-Id: I56057da6bae847533cc59e9881e364f632927cd9
David Sehr [Fri, 24 Jun 2016 18:12:08 +0000 (18:12 +0000)]
Merge \"Filter logging from dexdump/dex2oat to errors only\"
am:
be6b4fc1b3
Change-Id: Ib938b1bbf29e482d02c2c3b7d5a5948ba2afee9a
Chih-hung Hsieh [Fri, 24 Jun 2016 18:07:44 +0000 (18:07 +0000)]
Merge "Add +/- buttons to expand/collapse warning categories."
David Sehr [Fri, 24 Jun 2016 18:07:07 +0000 (18:07 +0000)]
Merge "Filter logging from dexdump/dex2oat to errors only"
Tianjie Xu [Fri, 24 Jun 2016 18:06:22 +0000 (18:06 +0000)]
Merge "Avoid writing too much new data per transfer" into nyc-mr1-dev
Ian Pedowitz [Fri, 24 Jun 2016 18:02:16 +0000 (18:02 +0000)]
Merge \"Revert \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\"\" into nyc-mr1-dev
am:
47383ac698
Change-Id: Ie77c32e654c396f59e92afdbd038d9c1ac4b211a
Ian Pedowitz [Fri, 24 Jun 2016 17:53:00 +0000 (17:53 +0000)]
Merge "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""" into nyc-mr1-dev
Ian Pedowitz [Fri, 24 Jun 2016 17:52:29 +0000 (17:52 +0000)]
Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""
This reverts commit
369efe3d84f059ba41560d6522520c747f1274b2.
Bug:
29117805
Bug:
28809789
Bug:
29621988
Change-Id: Icd9e01d4cbd3f769237702f5df287eb61c7527cd
Christopher Wiley [Fri, 24 Jun 2016 16:27:53 +0000 (16:27 +0000)]
Merge \\\"Fix path escaping for aidl generated java\\\" am:
7e918b6a46 am:
752860dcfc
am:
36b50e7897
Change-Id: I09ea45c8d72263a49e207b1b1b6f82384e4695be
David Sehr [Fri, 24 Jun 2016 16:17:04 +0000 (09:17 -0700)]
Filter logging from dexdump/dex2oat to errors only
Change-Id: Idb3f1c3d216e2db87ce3b03cbacc6fc3ceff37e0
Christopher Wiley [Fri, 24 Jun 2016 16:23:31 +0000 (16:23 +0000)]
Merge \\"Fix path escaping for aidl generated java\\" am:
7e918b6a46
am:
752860dcfc
Change-Id: Ia7ffaba007d115872f1d06f9f98ddeb993d11c9e
Christopher Wiley [Fri, 24 Jun 2016 16:19:25 +0000 (16:19 +0000)]
Merge \"Fix path escaping for aidl generated java\"
am:
7e918b6a46
Change-Id: I8e50a344d17c4585a725db95386ef6e0eb50fa58
Christopher Wiley [Fri, 24 Jun 2016 16:00:33 +0000 (16:00 +0000)]
Merge "Fix path escaping for aidl generated java"
Tao Bao [Fri, 24 Jun 2016 06:10:15 +0000 (06:10 +0000)]
Merge \\\"Fix the path for verity_key replacement when signing.\\\" am:
46abc55954 am:
5b9921369e
am:
1ea603491f
Change-Id: I8a2e24fdd1eca09ad25c74608d6c659078c5141c
Baligh Uddin [Fri, 24 Jun 2016 06:10:15 +0000 (06:10 +0000)]
Merge \\\"Add ability to pass in payload_signer args\\\" am:
8e6582b238 am:
8f9df9efb9
am:
c8338f1c35
Change-Id: I7ee94c455769d2322ee877e25d97900cc2965060
Tao Bao [Fri, 24 Jun 2016 06:07:02 +0000 (23:07 -0700)]
resolve merge conflicts of
63cc08f to nyc-mr1-dev-plus-aosp
Change-Id: I238ed096a611ccb0f2ad38ba4c1a02ceefa21b39
Tao Bao [Fri, 24 Jun 2016 05:44:18 +0000 (22:44 -0700)]
resolve merge conflicts of
fb45739 to nyc-mr1-dev-plus-aosp
Change-Id: I2e867189d4f827935a4ab8af6d5c1856a8413be0
Tao Bao [Fri, 24 Jun 2016 05:36:14 +0000 (22:36 -0700)]
resolve merge conflicts of
b281433 to nyc-mr1-dev-plus-aosp
Change-Id: I392b6798ad68af80d13b7e45f7b7381b19a501ac
Tao Bao [Fri, 24 Jun 2016 05:30:31 +0000 (05:30 +0000)]
Merge \\"Fix the path for verity_key replacement when signing.\\" am:
46abc55954
am:
5b9921369e
Change-Id: Iae1fbc6e07d1cada56d0f34b87dad2074b4664a6
Tao Bao [Fri, 24 Jun 2016 05:30:31 +0000 (05:30 +0000)]
Merge \\"Add ability to pass in payload_signer args\\" am:
8e6582b238
am:
8f9df9efb9
Change-Id: I3603ac55a8836406ca60c05959efffffb7ffca3a
Tao Bao [Fri, 24 Jun 2016 05:30:31 +0000 (05:30 +0000)]
Merge \\"releasetools: Support using payload_signer.\\" am:
983a42bdf1
am:
9322317ee7
Change-Id: I13c5eede68149c1dda6da9bb33a2527adc05dd8c
Tao Bao [Fri, 24 Jun 2016 05:30:30 +0000 (05:30 +0000)]
Merge \\"releasetools: replace verity keyid\\" am:
6efa887f9b
am:
45d28d7392
Change-Id: I2104805b0de9ca28fde19f2c460b540977260dc2
Tao Bao [Fri, 24 Jun 2016 05:30:30 +0000 (05:30 +0000)]
Merge \\"Replace OTA keys when signing for A/B devices.\\" am:
f2c34ece3c
am:
deb116a65d
Change-Id: Ib57f472bdd232a908e0399dc1365f9aaf8ddf3ba
Tao Bao [Fri, 24 Jun 2016 05:27:03 +0000 (05:27 +0000)]
Merge \"Fix the path for verity_key replacement when signing.\"
am:
46abc55954
Change-Id: I9496d5826e077a470ac0ddd3565e3547611e6bf1
Baligh Uddin [Fri, 24 Jun 2016 05:27:02 +0000 (05:27 +0000)]
Merge \"Add ability to pass in payload_signer args\"
am:
8e6582b238
Change-Id: I83ab46e365fd09c7bf3d4a97fddf289e5d819ce0
Tao Bao [Fri, 24 Jun 2016 05:27:02 +0000 (05:27 +0000)]
Merge \"releasetools: Support using payload_signer.\"
am:
983a42bdf1
Change-Id: I027ae0f71c3a57ffad476791721b111605844f1d
Badhri Jagan Sridharan [Fri, 24 Jun 2016 05:27:01 +0000 (05:27 +0000)]
Merge \"releasetools: replace verity keyid\"
am:
6efa887f9b
Change-Id: I63b11e2e0d27100a58a05ea91c0e7c29bb0597ff
Tao Bao [Fri, 24 Jun 2016 05:27:00 +0000 (05:27 +0000)]
Merge \"Replace OTA keys when signing for A/B devices.\"
am:
f2c34ece3c
Change-Id: I7eb287bd486d197b3c2c96616b558e7bc9536329
Tao Bao [Fri, 24 Jun 2016 05:20:20 +0000 (05:20 +0000)]
Merge "Fix the path for verity_key replacement when signing."
Tao Bao [Fri, 24 Jun 2016 05:20:06 +0000 (05:20 +0000)]
Merge "Add ability to pass in payload_signer args"
Tao Bao [Fri, 24 Jun 2016 05:19:53 +0000 (05:19 +0000)]
Merge "releasetools: Support using payload_signer."
Tao Bao [Fri, 24 Jun 2016 05:19:40 +0000 (05:19 +0000)]
Merge "releasetools: replace verity keyid"
Tao Bao [Fri, 24 Jun 2016 05:19:22 +0000 (05:19 +0000)]
Merge "Replace OTA keys when signing for A/B devices."
Tao Bao [Sat, 18 Jun 2016 00:01:22 +0000 (17:01 -0700)]
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
(cherry picked from commit
e0ee794fa16b206e792eac0942f448df34247fd8)
Baligh Uddin [Wed, 22 Jun 2016 19:14:16 +0000 (12:14 -0700)]
Add ability to pass in payload_signer args
Bug:
28701652
Change-Id: I110d5fc14446e4a6a0f8e25dcb0d300decdf09a4
(cherry picked from commit
2abbbd03339947327ada0becba5bd4ef41f1bdab)
Tao Bao [Tue, 21 Jun 2016 00:55:06 +0000 (17:55 -0700)]
releasetools: Support using payload_signer.
For A/B OTAs, by default it calls 'openssl pkeyutl' to sign the payload
and metadata with the package private key. If the private key cannot be
accessed directly, a payload signer that knows how to do that should be
supplied via "--payload_signer <signer>".
The signer will be called with "-inkey <path_to_private_key>",
"-in <input_file>" and "-out <output_file>" parameters.
Test: Use a dummy signer, call 'ota_from_target_files.py --payload_signer <signer> <target_files.zip> <ota.zip>' and verify the signatures in the generated package.
Bug:
28701652
Change-Id: I26cfdd3fdba6fc90799221741b75426988e46fd3
(cherry picked from commit
dea0f8bfed01fa620d23d7dd8ff533246f26e8a0)
Badhri Jagan Sridharan [Fri, 17 Jun 2016 02:58:44 +0000 (19:58 -0700)]
releasetools: replace verity keyid
Replace verity keyid with the keyid extracted from cert
passed through --replace_verity_keyid. The veritykeyid in the
BOOT/cmdline of input target files is replaced with keyid
extracted from --replace_verity_keyid and written to the
output target files.
BUG:
28384658
Change-Id: Ic683f36f543c4fcd94b6f95e40f01200fbf45ee1
(cherry picked from commit
b58d23fe00697a0cf9c7c9c75639fd8c7b5bb016)
Tao Bao [Thu, 16 Jun 2016 21:41:24 +0000 (14:41 -0700)]
Replace OTA keys when signing for A/B devices.
It replaces the package verification key (change of path due to
system_root_image flag), as well as the payload verification key.
Bug:
29397395
Change-Id: I10435072aaf4356f2d8b5e1b6e82eb9cead7ad62
(cherry picked from commit
24a72064309dd55d4aa80b70480eed55c54f818d)
Tao Bao [Fri, 24 Jun 2016 05:02:02 +0000 (05:02 +0000)]
Merge \"Fix the path for verity_key replacement when signing.\" into nyc-mr1-dev
am:
5fdbfac337
Change-Id: Id66964a5659c17f87404baaa73f9b90b98fac7fe
Tao Bao [Fri, 24 Jun 2016 04:54:20 +0000 (04:54 +0000)]
Merge "Fix the path for verity_key replacement when signing." into nyc-mr1-dev
Android Build Merger (Role) [Fri, 24 Jun 2016 03:44:20 +0000 (03:44 +0000)]
Merge "resolve merge conflicts of
012144f to nyc-dev am:
bb9a8d8eb8 am:
f46b7b2d77" into nyc-mr1-dev-plus-aosp
Jeff Vander Stoep [Fri, 24 Jun 2016 03:44:03 +0000 (03:44 +0000)]
resolve merge conflicts of
012144f to nyc-dev am:
bb9a8d8eb8
am:
b73e902c7d
Change-Id: Ib84efcf8d64e833f93b93b0ce3ddd1f6374949cf
Jeff Vander Stoep [Fri, 24 Jun 2016 03:44:03 +0000 (03:44 +0000)]
resolve merge conflicts of
012144f to nyc-dev am:
bb9a8d8eb8
am:
f46b7b2d77
Change-Id: I047f4bbcbe7c9edbbb3d849d7437a9c69a771580
Daniel Micay [Fri, 24 Jun 2016 03:40:22 +0000 (03:40 +0000)]
resolve merge conflicts of
012144f to nyc-dev
am:
bb9a8d8eb8
Change-Id: I140f5b3da3b65cd35cd7eb00d8406870f3c0c4ca
Daniel Micay [Fri, 24 Jun 2016 03:40:22 +0000 (03:40 +0000)]
resolve merge conflicts of
012144f to nyc-dev
am:
bb9a8d8eb8
Change-Id: I98ae278400ca59a342a1cc5fe751f0e911795003
Ian Pedowitz [Fri, 24 Jun 2016 02:51:25 +0000 (02:51 +0000)]
Merge \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\" into nyc-mr1-dev
am:
7b352c1d70
Change-Id: Ib23fca169a84e412643a8fcc79ed33126485192f
Roozbeh Pournader [Fri, 24 Jun 2016 02:51:25 +0000 (02:51 +0000)]
Merge \"Revert \"Add Serbian in Latin script to the full locale list\" [DO NOT MERGE]\" into nyc-mr1-dev
am:
9b6ce7bf0d
Change-Id: Ia696c61ce6e24e29627356cfe66819ac98dfafc2
Tao Bao [Fri, 24 Jun 2016 02:48:40 +0000 (19:48 -0700)]
resolve merge conflicts of
2abbbd0 to nyc-mr1-dev-plus-aosp
Change-Id: I2d06f0cec793185533ef2fc78428dfd99815030c
Tianjie Xu [Thu, 23 Jun 2016 23:10:35 +0000 (16:10 -0700)]
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
Christopher Wiley [Thu, 23 Jun 2016 23:44:47 +0000 (16:44 -0700)]
Fix path escaping for aidl generated java
Bug:
29619260
Change-Id: I806044573661c61e691adf36a47092188db87ab6
Test: Generated java with ../ in paths appears in the right place.
Tao Bao [Sat, 18 Jun 2016 00:01:22 +0000 (17:01 -0700)]
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
Jeff Vander Stoep [Thu, 23 Jun 2016 22:04:24 +0000 (15:04 -0700)]
resolve merge conflicts of
012144f to nyc-dev
Change-Id: If918f56d5c33db10978b4efc51cf3fe42ed71f1a
Ian Pedowitz [Thu, 23 Jun 2016 22:00:24 +0000 (22:00 +0000)]
Merge "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""" into nyc-mr1-dev
Roozbeh Pournader [Thu, 23 Jun 2016 21:52:35 +0000 (21:52 +0000)]
Merge "Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]" into nyc-mr1-dev
Daniel Micay [Thu, 23 Jun 2016 21:10:35 +0000 (21:10 +0000)]
Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into mnc-dev am:
11c84f95fb am:
a0c61fc832
am:
3cceebf11e
Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:07:28 +0000 (21:07 +0000)]
Merge \\"disable unpriv perf by default in user{,debug} builds\\" into mnc-dev am:
11c84f95fb
am:
a0c61fc832
Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
Daniel Micay [Thu, 23 Jun 2016 21:04:53 +0000 (21:04 +0000)]
Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am:
11c84f95fb
Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:00:03 +0000 (21:00 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev
Chih-Hung Hsieh [Thu, 23 Jun 2016 02:15:12 +0000 (19:15 -0700)]
Add +/- buttons to expand/collapse warning categories.
* Add expand/collapse-all buttons to expand/collapse all warnings.
* Use HTML styles to reduce output file size.
Change-Id: Ica188cc4f123ce0ab8547f88315325c3e0560a39
Test: Checked output html file with Chrome browser.
Roozbeh Pournader [Thu, 23 Jun 2016 20:03:44 +0000 (20:03 +0000)]
Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]
This reverts commit
4c6e1b62e09310fb0a688a6bd6ccf560b1c96d9f, since sr-Latn is no longer planned for MR1.
Bug:
29455508
Bug:
29601930
Change-Id: I47c240fa7456940ecb272f05e94f563b221c92c3
Ian Pedowitz [Thu, 23 Jun 2016 19:09:22 +0000 (19:09 +0000)]
Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""
This reverts commit
dc15ebc26cbf88dcba74aea1f005a1794c779ee6.
Fixes:
29117805
Bug:
28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
Baligh Uddin [Wed, 22 Jun 2016 19:14:16 +0000 (12:14 -0700)]
Add ability to pass in payload_signer args
Bug:
28701652
Change-Id: I110d5fc14446e4a6a0f8e25dcb0d300decdf09a4
Andreas Gampe [Thu, 23 Jun 2016 02:39:38 +0000 (02:39 +0000)]
Merge changes Ib4412657,I73e6d479 into nyc-mr1-dev
am:
fbe2eedb28
Change-Id: I5ba3ae957001974e33d6d6f49d542c05b9c13aba
TreeHugger Robot [Thu, 23 Jun 2016 02:30:21 +0000 (02:30 +0000)]
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
Alex Klyubin [Thu, 23 Jun 2016 00:42:43 +0000 (00:42 +0000)]
Merge \\\"Use Builder pattern for ApkVerifier parameters.\\\" am:
744e7746c4 am:
7dbd1ea408
am:
ef11808f84
Change-Id: I9e851e7e32ceab8ea35b4f31bf51d63046336484
Alex Klyubin [Thu, 23 Jun 2016 00:40:11 +0000 (00:40 +0000)]
Merge \\"Use Builder pattern for ApkVerifier parameters.\\" am:
744e7746c4
am:
7dbd1ea408
Change-Id: I425095197f451a3ea089cea75da13fbb01036f43
Alex Klyubin [Thu, 23 Jun 2016 00:37:28 +0000 (00:37 +0000)]
Merge \"Use Builder pattern for ApkVerifier parameters.\"
am:
744e7746c4
Change-Id: I36d18044ea627ff9f5f83ef8463476de07ce45ff
Andreas Gampe [Tue, 21 Jun 2016 00:46:29 +0000 (17:46 -0700)]
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
OSDN Git Service
