StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,241 Commits 1 Branch 0 Tags
b31b94e159ee6074b359c334166d6fc6084ea69c
Commit Graph

30241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Wiley
7e918b6a46 Merge "Fix path escaping for aidl generated java" 2016-06-24 16:00:33 +00:00
Tao Bao
1ea603491f Merge \\"Fix the path for verity_key replacement when signing.\\" am: 46abc55954 
am: 5b9921369e

Change-Id: Iae1fbc6e07d1cada56d0f34b87dad2074b4664a6
 2016-06-24 05:30:31 +00:00
Tao Bao
c8338f1c35 Merge \\"Add ability to pass in payload_signer args\\" am: 8e6582b238 
am: 8f9df9efb9

Change-Id: I3603ac55a8836406ca60c05959efffffb7ffca3a
 2016-06-24 05:30:31 +00:00
Tao Bao
63cc08f93d Merge \\"releasetools: Support using payload_signer.\\" am: 983a42bdf1 
am: 9322317ee7

Change-Id: I13c5eede68149c1dda6da9bb33a2527adc05dd8c
 2016-06-24 05:30:31 +00:00
Tao Bao
fb45739c55 Merge \\"releasetools: replace verity keyid\\" am: 6efa887f9b 
am: 45d28d7392

Change-Id: I2104805b0de9ca28fde19f2c460b540977260dc2
 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

Change-Id: Ib57f472bdd232a908e0399dc1365f9aaf8ddf3ba
 2016-06-24 05:30:30 +00:00
Tao Bao
5b9921369e Merge \"Fix the path for verity_key replacement when signing.\" 
am: 46abc55954

Change-Id: I9496d5826e077a470ac0ddd3565e3547611e6bf1
 2016-06-24 05:27:03 +00:00
Baligh Uddin
8f9df9efb9 Merge \"Add ability to pass in payload_signer args\" 
am: 8e6582b238

Change-Id: I83ab46e365fd09c7bf3d4a97fddf289e5d819ce0
 2016-06-24 05:27:02 +00:00
Tao Bao
9322317ee7 Merge \"releasetools: Support using payload_signer.\" 
am: 983a42bdf1

Change-Id: I027ae0f71c3a57ffad476791721b111605844f1d
 2016-06-24 05:27:02 +00:00
Badhri Jagan Sridharan
45d28d7392 Merge \"releasetools: replace verity keyid\" 
am: 6efa887f9b

Change-Id: I63b11e2e0d27100a58a05ea91c0e7c29bb0597ff
 2016-06-24 05:27:01 +00:00
Tao Bao
deb116a65d Merge \"Replace OTA keys when signing for A/B devices.\" 
am: f2c34ece3c

Change-Id: I7eb287bd486d197b3c2c96616b558e7bc9536329
 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
Badhri Jagan Sridharan
35c9b1243f 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 b58d23fe00)
 2016-06-23 22:13:12 -07:00
Tao Bao
a80ed221b8 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 24a7206430)
 2016-06-23 22:12:31 -07:00
Daniel Micay
b73e902c7d resolve merge conflicts of 012144f to nyc-dev 
am: bb9a8d8eb8

Change-Id: I140f5b3da3b65cd35cd7eb00d8406870f3c0c4ca
 2016-06-24 03:40:22 +00:00
Christopher Wiley
d9205ba17e Fix path escaping for aidl generated java 
Bug: 29619260
Change-Id: I806044573661c61e691adf36a47092188db87ab6
Test: Generated java with ../ in paths appears in the right place.
 2016-06-23 16:49:32 -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
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
Chih-Hung Hsieh
465b610183 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.
 2016-06-23 13:18:58 -07:00
Alex Klyubin
ef11808f84 Merge \\"Use Builder pattern for ApkVerifier parameters.\\" am: 744e7746c4 
am: 7dbd1ea408

Change-Id: I425095197f451a3ea089cea75da13fbb01036f43
 2016-06-23 00:40:11 +00:00
Alex Klyubin
7dbd1ea408 Merge \"Use Builder pattern for ApkVerifier parameters.\" 
am: 744e7746c4

Change-Id: I36d18044ea627ff9f5f83ef8463476de07ce45ff
 2016-06-23 00:37:28 +00:00
Treehugger Robot
744e7746c4 Merge "Use Builder pattern for ApkVerifier parameters." 2016-06-23 00:31:53 +00:00
Alex Klyubin
9a41c93f41 Use Builder pattern for ApkVerifier parameters. 
This should make it easier to add parameters/options without breaking
existing clients.

Bug: 27461702
Change-Id: Ia4577f78d703a6b91828dd08492c78d5e9afb110
 2016-06-22 14:59:12 -07:00
Dan Willemsen
24260479f3 Merge \\"Finish refactoring tests to NATIVE_TESTS\\" am: 239f2b0f9f 
am: fed8d9e9f7

Change-Id: I66fd8b66a0acbc2fbb653bf2d90d3a68727d14e8
 2016-06-22 20:44:42 +00:00
Dan Willemsen
fed8d9e9f7 Merge \"Finish refactoring tests to NATIVE_TESTS\" 
am: 239f2b0f9f

Change-Id: If34f994893a9ad00cadb3a6124ee21ccf36b142c
 2016-06-22 20:41:57 +00:00
Treehugger Robot
239f2b0f9f Merge "Finish refactoring tests to NATIVE_TESTS" 2016-06-22 20:37:41 +00:00
Dan Willemsen
e1c6deab10 Finish refactoring tests to NATIVE_TESTS 
Now that the source trees all use NATIVE_TESTS for intermediate files
and generated sources, make it a requirement.

Change-Id: Id5718fabe63f6e8dde7981a6f0f5bd89e0ec7ee5
 2016-06-22 00:27:54 -07:00
Tianjie Xu
5371829b86 Merge \"Limit the number of blocks in command zero\" into nyc-dev 
am: 0eade3f027

Change-Id: I7f5cc1319863eb1ec1d87b6bf3e9cb62f3401e41
 2016-06-22 05:17:42 +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
a36f36dcc0 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: If484b9ee55f16b85cead3587d08c757ae8df6d2b
 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
Zach Jang
1be6c69524 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb 
am: e7bc1542db

Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
 2016-06-22 01:41:13 +00:00
Zach Jang
e7bc1542db resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 
am: 3749025ccb

Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
 2016-06-22 01:38:31 +00:00
Zach Jang
3749025ccb resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 
am: 9fc3cf7ba2

Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
 2016-06-22 01:35:58 +00:00
Zach Jang
9fc3cf7ba2 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 
am: cbf1e2cc94

Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
 2016-06-22 01:33:23 +00:00
Zach Jang
cbf1e2cc94 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 
am: cf51c6cb29

Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
 2016-06-22 01:30:23 +00:00
Zach Jang
cf51c6cb29 resolve merge conflicts of 12db224 to lmp-mr1-dev 
am: 0c672afc40

Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
 2016-06-22 01:27:49 +00:00
Zach Jang
0c672afc40 resolve merge conflicts of 12db224 to lmp-mr1-dev 
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
 2016-06-21 18:23:46 -07:00
Zach Jang
12db224269 resolve merge conflicts of 24cfbfa to lmp-dev 
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
 2016-06-21 18:13:17 -07:00
Guang Zhu
49e12eab71 Merge \\"move test artifact build rules into open source location\\" am: 59e060e1c6 
am: c8e8f38faa

Change-Id: I81bf4856cb2489e7983b0859df3dc36f2bee2e01
 2016-06-22 01:00:44 +00:00