Commit graph

38243 commits

Author SHA1 Message Date
Tao Bao
7c58e8f438 Merge "Support replacing AVB signing keys." am: 682849976d am: b5363b2dbc
am: 118b3243f8

Change-Id: I725f16a05c9005c0a8b0c7753396cd3a1c7f3812
2017-06-28 19:48:24 +00:00
Tao Bao
118b3243f8 Merge "Support replacing AVB signing keys." am: 682849976d
am: b5363b2dbc

Change-Id: I8388e8c3c3bf801d7a9d50f111e91555b933a4d7
2017-06-28 19:44:54 +00:00
Tao Bao
b5363b2dbc Merge "Support replacing AVB signing keys."
am: 682849976d

Change-Id: Iedbd4ce27ffdfeb3d88406f75636221739427add
2017-06-28 19:41:25 +00:00
Tao Bao
0782db1b0f Merge "Delay the write-back of misc_info in sign_target_files_apks.py." into oc-dr1-dev
am: 7b8a7936dd

Change-Id: I67bacddbb00ac47124f5ad2bc059a7558847f302
2017-06-28 19:41:23 +00:00
Tao Bao
7b8a7936dd Merge "Delay the write-back of misc_info in sign_target_files_apks.py." into oc-dr1-dev 2017-06-28 19:36:51 +00:00
Treehugger Robot
682849976d Merge "Support replacing AVB signing keys." 2017-06-28 19:36:09 +00:00
Tao Bao
57ae9a2234 Delay the write-back of misc_info in sign_target_files_apks.py.
Currently we're writing META/misc_info.txt to the new TF.zip during
ReplaceVerityPrivateKey(). We should delay that until we have replaced
everything in need. Otherwise we won't be able to replace/overwrite
that zip entry (unless `zip -d` first).

This CL also cleans up the return value of ReplaceVerityPublicKey() and
ReplaceVerityKeyId(), since the caller no longer needs the values.

Test: sign_target_files_apks.py and check the generated signed TF.zip.
Change-Id: I9fbd7182247728281519e5e3971557f6b018ad65
(cherry picked from commit 46a5999a02)
2017-06-28 11:07:34 -07:00
SzuWei Lin
87a643cfa1 Merge "Update new HIDL interfaces in generic system image" into oc-dr1-dev
am: e07c2ed19e

Change-Id: I61cd06b0d9f5827b8c26728b2bed0647b7bab4d5
2017-06-28 07:44:37 +00:00
TreeHugger Robot
e07c2ed19e Merge "Update new HIDL interfaces in generic system image" into oc-dr1-dev 2017-06-28 07:40:58 +00:00
Hung-ying Tyan
34b887f59d Merge "Move /default.prop to /system/etc/prop.default" into oc-dev-plus-aosp
am: 5a7a3aca13  -s ours

Change-Id: I823faa65ad6a9a915bffd7b751fe9e7e7662c365
2017-06-28 06:34:39 +00:00
Hung-ying Tyan
331fd11216 Merge "Move /default.prop to /system/etc/prop.default" into oc-dr1-dev
am: 3b7460eda9

Change-Id: I8b610498ddae48f93e7d9e23225b7361d4e0f8b7
2017-06-28 06:31:17 +00:00
TreeHugger Robot
5a7a3aca13 Merge "Move /default.prop to /system/etc/prop.default" into oc-dev-plus-aosp 2017-06-28 06:29:33 +00:00
TreeHugger Robot
3b7460eda9 Merge "Move /default.prop to /system/etc/prop.default" into oc-dr1-dev 2017-06-28 06:28:10 +00:00
Bowgo Tsai
bd56083dcb Removing vboot 1.0 verity metadata
am: 952f6a458e

Change-Id: Idf363438d6855a5c783e2e037c9bc9aca64c4653
2017-06-28 06:02:00 +00:00
SzuWei Lin
7db5d2c9f3 Update new HIDL interfaces in generic system image
Bug: 63051055
Test: Boot with GSI to home screen
Change-Id: Id5783355e9fae8f48088d4a9eaaf8429425adb45
2017-06-28 09:36:36 +08:00
Tao Bao
639118ff4d Support replacing AVB signing keys.
sign_target_files_apks.py now supports signing targets using verified
boot 2.0 (aka AVB). It allows replacing AVB signing keys for both of
chained and non-chained partitions.

An example command line looks as follows.
 $ ./build/tools/releasetools/sign_target_files_apks.py \
     --avb_vbmeta_key external/avb/test/data/testkey_rsa2048.pem \
     --avb_vbmeta_algorithm SHA256_RSA2048 \
     --avb_vbmeta_extra_args \
         "--signing_helper_with_files ./signing-helper.sh" \
     --avb_system_key external/avb/test/data/testkey_rsa4096.pem \
     --avb_system_algorithm SHA256_RSA4096 \
     --avb_system_extra_args \
         "--signing_helper_with_files ./signing-helper.sh" \
     product-target_files.eng.zip signed-product-target_files.zip

To verify the signed images:
 $ unzip signed-product-target_files.zip IMAGES/\*
 $ avbtool verify_image --image IMAGES/vbmeta.img \
     --expected_chain_partition system:1:testkey_rsa4096_pub.pem \
     --key external/avb/test/data/testkey_rsa2048.pem

Bug: 38315721
Test: sign_target_files_apks.py on AVB-enabled target w/ and w/o chained
      partitions respectively. Check the signing command lines; validate
      the signed images with 'avbtool verify_image'.
Change-Id: Ia009555b16ddb6d8ba6a0858d5ca7d983bbab887
2017-06-27 10:50:46 -07:00
Bowgo Tsai
952f6a458e Removing vboot 1.0 verity metadata
The generic system.img shouldn't contain any specific verity metadata
because we don't mandate how to do verified boot. Plus, OC-DR devices
use AVB instead of vboot 1.0.

Bug: 62647718
Test: Boot a DR device with the generic system.img
Change-Id: I0966d88d4512621cce7b8abdc28a90a6e312a391
2017-06-27 18:13:56 +08:00
Hung-ying Tyan
7eb6a926ad Move /default.prop to /system/etc/prop.default
This patch tries to fix the problem where the default properties need
to go with the system image especially on non-AB devices where
/default.prop is on the ramdisk image. A symlink is created at
/default.prop for backward compatibility.

Bug: 37815285
Test: Tested with ag/2416542. Booted pixel phones, checked the location
      of prop.default, verified the symlink, checked a few properties
      (via adb shell getprop) and manually tested a few apps (Camera,
      Maps etc).
      sign_target_files_apks.py was tested with:
      sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
          -e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
          -e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
      Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
Merged-In: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
(cherry-picked from 4fbbe4578bb10d54292d9b243edf4999fddf1c93)
2017-06-27 15:10:32 +08:00
Hung-ying Tyan
f829b40c48 Move /default.prop to /system/etc/prop.default
This patch tries to fix the problem where the default properties need
to go with the system image especially on non-AB devices where
/default.prop is on the ramdisk image. A symlink is created at
/default.prop for backward compatibility.

Bug: 37815285
Test: Tested with ag/2416542. Booted pixel phones, checked the location
      of prop.default, verified the symlink, checked a few properties
      (via adb shell getprop) and manually tested a few apps (Camera,
      Maps etc).
      sign_target_files_apks.py was tested with:
      sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
          -e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
          -e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
      Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
2017-06-27 15:05:17 +08:00
Tao Bao
8755afb153 Rewrite the prop file at BOOT/RAMDISK/prop.default. am: e51b671e1e -s ours
am: 6298a8796f

Change-Id: I91924ebf431e8a61a5ddada642047c5a655be20f
2017-06-27 01:42:47 +00:00
Tao Bao
2131c54e01 Rewrite the prop file at BOOT/RAMDISK/prop.default. am: e51b671e1e -s ours
am: 96040f39bc

Change-Id: I77b13aad452a5fffc14317c11b6e0af73cee2a67
2017-06-27 01:42:14 +00:00
Tao Bao
96040f39bc Rewrite the prop file at BOOT/RAMDISK/prop.default.
am: e51b671e1e  -s ours

Change-Id: If2bae03a9ecaa4780ffc83aebeab4db86c7a248e
2017-06-27 01:40:43 +00:00
Tao Bao
6298a8796f Rewrite the prop file at BOOT/RAMDISK/prop.default.
am: e51b671e1e  -s ours

Change-Id: I311a3a486a8e4b08b53afeba3760f6682fcef824
2017-06-27 01:40:42 +00:00
Tao Bao
e51b671e1e Rewrite the prop file at BOOT/RAMDISK/prop.default.
This is the new prop filename after commit
a6b68e72b1.

Bug: 63038934
Test: sign_target_files_apks.py with marlin TF.zip.  Check the contents
      in BOOT/RAMDISK/prop.default in signed-TF.zip.
Change-Id: I78106b68c387769bce50804c141c9e14dff55c09
2017-06-26 17:11:36 -07:00
SzuWei Lin
9df6f1c5ca Merge "Add wificond to Android makefiles" into oc-dr1-dev
am: b1cbbaf528

Change-Id: I584ad2a70099f1fb189766df79a1c19ac6927b73
2017-06-25 13:55:06 +00:00
TreeHugger Robot
b1cbbaf528 Merge "Add wificond to Android makefiles" into oc-dr1-dev 2017-06-25 13:49:44 +00:00
Colin Cross
7a1615fb66 Merge "Get java config from soong" am: bf215d166b am: 253ffe20e1
am: df973cb239

Change-Id: I4b6ad0f2f019f7e3804fc55a86db0d0930888f27
2017-06-23 22:02:04 +00:00
Colin Cross
df973cb239 Merge "Get java config from soong" am: bf215d166b
am: 253ffe20e1

Change-Id: I4250672ec7cd18a4f82c3e4019a9ec418a17df11
2017-06-23 21:57:03 +00:00
Colin Cross
253ffe20e1 Merge "Get java config from soong"
am: bf215d166b

Change-Id: I3a5c06e74837baa4174d15c04d25bc61a9aac2d1
2017-06-23 21:48:49 +00:00
Treehugger Robot
bf215d166b Merge "Get java config from soong" 2017-06-23 21:40:16 +00:00
Huan Ren
d078b2af99 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev am: 76946c6ab6
am: 874ee28b68

Change-Id: Id10700d9a12f174448fc94576cf3e66d10d1ef9f
2017-06-23 19:57:23 +00:00
Huan Ren
65608038bc Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev am: 76946c6ab6
am: b2d7fa3d83

Change-Id: Ica1a7d3448f3ac7c44918df39fd84fb02cdb624c
2017-06-23 19:52:29 +00:00
Huan Ren
b2d7fa3d83 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev
am: 76946c6ab6

Change-Id: I1e48abd776c7fa9c1ae75a6a62e730bea0845c94
2017-06-23 19:47:29 +00:00
Huan Ren
874ee28b68 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev
am: 76946c6ab6

Change-Id: I2a87da8ab334e8fa7a2076677dc27bc75a09dbff
2017-06-23 19:43:01 +00:00
Huan Ren
76946c6ab6 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev 2017-06-23 18:33:16 +00:00
Android Build Merger (Role)
2005f395de Merge "Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57 am: 2d3b1ca45a am: ac1a012d21" into oc-dr1-dev-plus-aosp 2017-06-23 02:07:32 +00:00
Andreas Gampe
9d8d51a7e5 Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57 am: 2d3b1ca45a
am: ac1a012d21

Change-Id: I7b4cd4affb519b863df943c583260f69b7e13719
2017-06-23 02:06:58 +00:00
Bowgo Tsai
908577a4f4 Merge "Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf" into oc-dr1-dev
am: 9c2b22c487

Change-Id: I5e076c940ea3b7a09d8f3ed4a6a5b87ce8aa0021
2017-06-23 02:06:16 +00:00
Andreas Gampe
ac1a012d21 Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57
am: 2d3b1ca45a

Change-Id: I28d9d8369f374e7b20461a4e931e70aafe3a10eb
2017-06-23 02:01:57 +00:00
TreeHugger Robot
9c2b22c487 Merge "Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf" into oc-dr1-dev 2017-06-23 02:00:42 +00:00
Andreas Gampe
2d3b1ca45a Merge "Build: Use ART phony packages in runtime_libart"
am: 47b734db57

Change-Id: Ibad6205131c8c3d562eb1f3d3eff3a6b8916a432
2017-06-23 01:57:26 +00:00
Treehugger Robot
47b734db57 Merge "Build: Use ART phony packages in runtime_libart" 2017-06-23 01:47:33 +00:00
Dimitry Ivanov
a7955c286e Enable linker warning toast for userdebug/eng builds
am: 7caea14111

Change-Id: I292da7d7d6b9f85a4108e8150a5e032fd5833e0a
2017-06-23 00:35:35 +00:00
Colin Cross
b12d4b7ac2 Get java config from soong
Soong will export java config variables.

Test: builds
Change-Id: If185543f8f36a30e7632946c16351d44f012bd6a
2017-06-22 17:21:05 -07:00
Andreas Gampe
ae4916b0ad Build: Use ART phony packages in runtime_libart
Move definition of necessary packages for ART to art/Android.mk.
Use the phony packages defined there in runtime_libart.mk.

Bug: 62087184
Test: m
Test: Device boots
Change-Id: Iae6e5bba2184b098820783dc5e9f6b5f2a9836e9
2017-06-22 15:35:14 -07:00
Dimitry Ivanov
7caea14111 Enable linker warning toast for userdebug/eng builds
We did not want this to appear for dogfood devices before
because it was noisy, most of popular apps fixed this
problem and it should be much less noisy.

Bug: http://b/62455348
Test: make
Change-Id: Icd28e9ef87f2d1edf456d178741c67ef42670ae1
2017-06-22 14:53:10 -07:00
Tianjie Xu
09cdaf1c31 Merge "Remove the obsolete location check for install-recovery.sh" am: 8fb65a5d63 am: ea5dad9010
am: 35f6f99056

Change-Id: Ic308f04d223c8cbec7f5a3678a2060ff0e118868
2017-06-22 18:31:49 +00:00
Tianjie Xu
fba679ca65 Merge "Verify the contents in install-recovery.sh" am: 924c1c0598 am: 01c463e406
am: e0bda97ea1

Change-Id: Id95b556c0a0f2e8e3b5ad56fd36e8e131437f6d0
2017-06-22 18:31:39 +00:00
Tianjie Xu
35f6f99056 Merge "Remove the obsolete location check for install-recovery.sh" am: 8fb65a5d63
am: ea5dad9010

Change-Id: I26e314431a87732a486566d2702106d28d323d92
2017-06-22 18:27:49 +00:00
Tianjie Xu
e0bda97ea1 Merge "Verify the contents in install-recovery.sh" am: 924c1c0598
am: 01c463e406

Change-Id: Ie8177614c855e3f554184d570b2f98b29aefc8c6
2017-06-22 18:27:39 +00:00