Ian Pedowitz
c3e2c808de
Merge \\"The easter egg is now its own APK.\\" into nyc-dev am: 18ecea3986
...
am: 377d5bdb3f
2016-06-26 23:03:00 +00:00
Dan Sandler
377d5bdb3f
Merge \"The easter egg is now its own APK.\" into nyc-dev
...
am: 18ecea3986
2016-06-26 22:56:05 +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
Christopher Wiley
ef2a8bc195
Merge \\\"Fix typo in setting PRIVATE_MODULE for AIDL source\\\" am: 05038d84dc am: 2ee4f68d38
...
am: 28db78a499
2016-06-24 21:34:33 +00:00
Christopher Wiley
28db78a499
Merge \\"Fix typo in setting PRIVATE_MODULE for AIDL source\\" am: 05038d84dc
...
am: 2ee4f68d38
2016-06-24 21:32:07 +00:00
Christopher Wiley
2ee4f68d38
Merge \"Fix typo in setting PRIVATE_MODULE for AIDL source\"
...
am: 05038d84dc
2016-06-24 21:29:55 +00:00
Treehugger Robot
05038d84dc
Merge "Fix typo in setting PRIVATE_MODULE for AIDL source"
2016-06-24 21:16:23 +00:00
Christopher Wiley
dc9e2675e6
Fix typo in setting PRIVATE_MODULE for AIDL source
...
Bug: 29619260
Change-Id: I59f883c1a92075800844cc2a77b307782a9ab800
2016-06-24 13:13:52 -07:00
Chih-Hung Hsieh
1a256fac08
Merge \\\"Add +/- buttons to expand/collapse warning categories.\\\" am: 4837ce8ca6 am: 320d126394
...
am: a612b58464
2016-06-24 18:21:46 +00:00
David Sehr
d17cce2f60
Merge \\\"Filter logging from dexdump/dex2oat to errors only\\\" am: be6b4fc1b3 am: 5efb73504d
...
am: 0aa5ad21f1
2016-06-24 18:21:45 +00:00
Chih-hung Hsieh
a612b58464
Merge \\"Add +/- buttons to expand/collapse warning categories.\\" am: 4837ce8ca6
...
am: 320d126394
2016-06-24 18:17:05 +00:00
David Sehr
0aa5ad21f1
Merge \\"Filter logging from dexdump/dex2oat to errors only\\" am: be6b4fc1b3
...
am: 5efb73504d
2016-06-24 18:17:04 +00:00
Tianjie Xu
5af8cf9732
Merge \"Avoid writing too much new data per transfer\" into nyc-mr1-dev
...
am: 21e6dde63c
2016-06-24 18:12:13 +00:00
Chih-Hung Hsieh
320d126394
Merge \"Add +/- buttons to expand/collapse warning categories.\"
...
am: 4837ce8ca6
2016-06-24 18:12:10 +00:00
David Sehr
5efb73504d
Merge \"Filter logging from dexdump/dex2oat to errors only\"
...
am: be6b4fc1b3
2016-06-24 18:12:08 +00:00
Chih-hung Hsieh
4837ce8ca6
Merge "Add +/- buttons to expand/collapse warning categories."
2016-06-24 18:07:44 +00:00
David Sehr
be6b4fc1b3
Merge "Filter logging from dexdump/dex2oat to errors only"
2016-06-24 18:07:07 +00: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
3f93d12a4b
Merge \"Revert \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\"\" into nyc-mr1-dev
...
am: 47383ac698
2016-06-24 18:02:16 +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
2016-06-24 17:52:29 +00:00
Christopher Wiley
fdf4f7ea21
Merge \\\"Fix path escaping for aidl generated java\\\" am: 7e918b6a46 am: 752860dcfc
...
am: 36b50e7897
2016-06-24 16:27:53 +00:00
David Sehr
49fbdd1f28
Filter logging from dexdump/dex2oat to errors only
...
Change-Id: Idb3f1c3d216e2db87ce3b03cbacc6fc3ceff37e0
2016-06-24 09:27:00 -07:00
Christopher Wiley
36b50e7897
Merge \\"Fix path escaping for aidl generated java\\" am: 7e918b6a46
...
am: 752860dcfc
2016-06-24 16:23:31 +00:00
Christopher Wiley
752860dcfc
Merge \"Fix path escaping for aidl generated java\"
...
am: 7e918b6a46
2016-06-24 16:19:25 +00:00
Christopher Wiley
7e918b6a46
Merge "Fix path escaping for aidl generated java"
2016-06-24 16:00:33 +00:00
Tao Bao
cac9724f5a
Merge \\\"Fix the path for verity_key replacement when signing.\\\" am: 46abc55954 am: 5b9921369e
...
am: 1ea603491f
2016-06-24 06:10:15 +00:00
Baligh Uddin
c9603a785e
Merge \\\"Add ability to pass in payload_signer args\\\" am: 8e6582b238 am: 8f9df9efb9
...
am: c8338f1c35
2016-06-24 06:10:15 +00:00
Tao Bao
7df3890039
resolve merge conflicts of 63cc08f to nyc-mr1-dev-plus-aosp
...
Change-Id: I238ed096a611ccb0f2ad38ba4c1a02ceefa21b39
2016-06-23 23:08:09 -07:00
Tao Bao
377f5944f6
resolve merge conflicts of fb45739 to nyc-mr1-dev-plus-aosp
...
Change-Id: I2e867189d4f827935a4ab8af6d5c1856a8413be0
2016-06-23 22:46:04 -07:00
Tao Bao
707c4ae757
resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp
...
Change-Id: I392b6798ad68af80d13b7e45f7b7381b19a501ac
2016-06-23 22:36:14 -07:00
Tao Bao
1ea603491f
Merge \\"Fix the path for verity_key replacement when signing.\\" am: 46abc55954
...
am: 5b9921369e
2016-06-24 05:30:31 +00:00
Tao Bao
c8338f1c35
Merge \\"Add ability to pass in payload_signer args\\" am: 8e6582b238
...
am: 8f9df9efb9
2016-06-24 05:30:31 +00:00
Tao Bao
63cc08f93d
Merge \\"releasetools: Support using payload_signer.\\" am: 983a42bdf1
...
am: 9322317ee7
2016-06-24 05:30:31 +00:00
Tao Bao
fb45739c55
Merge \\"releasetools: replace verity keyid\\" am: 6efa887f9b
...
am: 45d28d7392
2016-06-24 05:30:30 +00:00
Tao Bao
b2814336a0
Merge \\"Replace OTA keys when signing for A/B devices.\\" am: f2c34ece3c
...
am: deb116a65d
2016-06-24 05:30:30 +00:00
Tao Bao
5b9921369e
Merge \"Fix the path for verity_key replacement when signing.\"
...
am: 46abc55954
2016-06-24 05:27:03 +00:00
Baligh Uddin
8f9df9efb9
Merge \"Add ability to pass in payload_signer args\"
...
am: 8e6582b238
2016-06-24 05:27:02 +00:00
Tao Bao
9322317ee7
Merge \"releasetools: Support using payload_signer.\"
...
am: 983a42bdf1
2016-06-24 05:27:02 +00:00
Badhri Jagan Sridharan
45d28d7392
Merge \"releasetools: replace verity keyid\"
...
am: 6efa887f9b
2016-06-24 05:27:01 +00:00
Tao Bao
deb116a65d
Merge \"Replace OTA keys when signing for A/B devices.\"
...
am: f2c34ece3c
2016-06-24 05:27:00 +00:00
Tao Bao
46abc55954
Merge "Fix the path for verity_key replacement when signing."
2016-06-24 05:20:20 +00:00
Tao Bao
8e6582b238
Merge "Add ability to pass in payload_signer args"
2016-06-24 05:20:06 +00:00
Tao Bao
983a42bdf1
Merge "releasetools: Support using payload_signer."
2016-06-24 05:19:54 +00:00
Tao Bao
6efa887f9b
Merge "releasetools: replace verity keyid"
2016-06-24 05:19:40 +00:00
Tao Bao
f2c34ece3c
Merge "Replace OTA keys when signing for A/B devices."
2016-06-24 05:19:22 +00:00
Tao Bao
8adcfd1688
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 e0ee794fa1
2016-06-23 22:17:46 -07:00
Baligh Uddin
34eb000de5
Add ability to pass in payload_signer args
...
Bug: 28701652
Change-Id: I110d5fc14446e4a6a0f8e25dcb0d300decdf09a4
(cherry picked from commit 2abbbd0333
2016-06-23 22:16:46 -07:00
Tao Bao
1a5e1d18a7
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 dea0f8bfed
2016-06-23 22:15:30 -07:00
