p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,871 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

29871 Commits

Author SHA1 Message Date
Badhri Jagan Sridharan 45373976b1 Merge \"Extract public key ID from cert\" 
am: 606ad22def

Change-Id: Idfc1ff8ec8766d4b15a5b1908a8eb830e28b42f3
 2016-06-28 23:40:22 +00:00
Badhri Jagan Sridharan 606ad22def Merge "Extract public key ID from cert" 2016-06-28 23:36:23 +00:00
Badhri Jagan Sridharan 131e1977f6 Extract public key ID from cert 
Extracts keyid inline using openssl commands.
The keyid is passed as one of the kernel command line parameters
for the dm-android-verity module to mount root fs(system)
with verity enabled.

(cherry-picked from 3af315aed5
https://googleplex-android-review.git.corp.google.com/#/c/1061691/)

BUG: 28384658
Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484
 2016-06-28 23:35:41 +00:00
Dan Willemsen 90f03ecfee Merge \"Turn unused source files from warning to error\" 
am: 73609480b3

Change-Id: Iddedac74a78968eb438bddae1e22633ba8c13375
 2016-06-28 19:48:32 +00:00
Treehugger Robot 73609480b3 Merge "Turn unused source files from warning to error" 2016-06-28 19:41:39 +00:00
Dan Willemsen 9efeb1ea4f Turn unused source files from warning to error 
All instances have disappeared from the build server, so switch this to
error before more turn up.

Change-Id: Iac07526a6e77ebf33733033249f2a108aae3fa7d
 2016-06-28 10:22:08 -07:00
Hung-ying Tyan 00e23a1d8f Merge \\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\" am: 2acb2d5bcf 
am: 200da242a5

Change-Id: I93d1b301c23265e783e68de5e066606764b90ffc
 2016-06-28 06:24:48 +00:00
Hung-ying Tyan 200da242a5 Merge \"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\" 
am: 2acb2d5bcf

Change-Id: I3c151949bcc6b8d75f2c46619b6ce38561084338
 2016-06-28 06:22:17 +00:00
Treehugger Robot 2acb2d5bcf Merge "Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES" 2016-06-28 06:17:32 +00:00
Hung-ying Tyan 3c054d8e1f 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
 2016-06-28 10:10:53 +08:00
Ethan Xia e4efe69fae Merge \\"releasetools: Change the default key path for bvbtool\\" am: 7c7571d510 
am: 090e8eff5e

Change-Id: I34f3cc1a38b860fd3100548f55a38af9faf69e19
 2016-06-28 01:59:47 +00:00
Ethan Xia 090e8eff5e Merge \"releasetools: Change the default key path for bvbtool\" 
am: 7c7571d510

Change-Id: Ic02f432c689edba37ecce684662d8f5f1cfc32b6
 2016-06-28 01:57:26 +00:00
Treehugger Robot 7c7571d510 Merge "releasetools: Change the default key path for bvbtool" 2016-06-28 01:52:36 +00:00
Ethan Xia 37b4a9819b releasetools: Change the default key path for bvbtool 
The bvb path has been changed from 'system/bvb' to 'external/bvb'

Change-Id: I8587351b7d702a287883c6bd3c9de1cd3540435b
 2016-06-27 17:19:01 +08:00
Dan Sandler 377d5bdb3f Merge \"The easter egg is now its own APK.\" into nyc-dev 
am: 18ecea3986

Change-Id: I4712931d6e73ecb08dae76b77ad12585a914882b
 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 28db78a499 Merge \\"Fix typo in setting PRIVATE_MODULE for AIDL source\\" am: 05038d84dc 
am: 2ee4f68d38

Change-Id: Ifd141422ed041b077ba1f3c098b85b8d93feda42
 2016-06-24 21:32:07 +00:00
Christopher Wiley 2ee4f68d38 Merge \"Fix typo in setting PRIVATE_MODULE for AIDL source\" 
am: 05038d84dc

Change-Id: I3fb16f448c48e9e14fb4e7080c2955c3d38c6d11
 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 a612b58464 Merge \\"Add +/- buttons to expand/collapse warning categories.\\" am: 4837ce8ca6 
am: 320d126394

Change-Id: I637c546da197a7d9cc6b1ea91dc6f45f51f7ecda
 2016-06-24 18:17:05 +00:00
David Sehr 0aa5ad21f1 Merge \\"Filter logging from dexdump/dex2oat to errors only\\" am: be6b4fc1b3 
am: 5efb73504d

Change-Id: I3a39624a5ce329f67c30ce71b00f685abd14f569
 2016-06-24 18:17:04 +00:00
Chih-Hung Hsieh 320d126394 Merge \"Add +/- buttons to expand/collapse warning categories.\" 
am: 4837ce8ca6

Change-Id: I56057da6bae847533cc59e9881e364f632927cd9
 2016-06-24 18:12:10 +00:00
David Sehr 5efb73504d Merge \"Filter logging from dexdump/dex2oat to errors only\" 
am: be6b4fc1b3

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

Change-Id: Ia7ffaba007d115872f1d06f9f98ddeb993d11c9e
 2016-06-24 16:23:31 +00:00
Christopher Wiley 752860dcfc Merge \"Fix path escaping for aidl generated java\" 
am: 7e918b6a46

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