Commit graph

473 commits

Author SHA1 Message Date
Bowgo Tsai
90f4777cdd Merge "Support signing custom_images with AVB" am: e09809a32d am: d8c0bb8f61
am: e047421956

Change-Id: I8d22ff2d4a9bd999d99637f61e2dfabd64069978
2017-08-25 08:05:23 +00:00
Bowgo Tsai
d8c0bb8f61 Merge "Support signing custom_images with AVB"
am: e09809a32d

Change-Id: I292276a499f185d6eff84a2996d9b987a5209124
2017-08-25 07:56:01 +00:00
Bowgo Tsai
480dc7c19d Support signing custom_images with AVB
Current AVB signing for custom images is enabled by either of the
following build variables:
  CUSTOM_IMAGE_AVB_HASH_ENABLE := true
  CUSTOM_IMAGE_AVB_HASHTREE_ENABLE := true

A previous change to support chain partition replaced avb_signing_args
with avb_key_path and avb_algorithm. This change updates the
corresponding change for custom_images.

To sign a custom_image as a chain partition, it needs:
  CUSTOM_IMAGE_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
  CUSTOM_IMAGE_AVB_ALGORITHM := SHA256_RSA2048
  CUSTOM_IMAGE_AVB_ROLLBACK_INDEX := 1

Note that it doesn't support include metadata of custom images into
vbmeta.img. Because custom_images is designed to build multiple files
(e.g., custom1.img, custom2.img, custom3.img, etc) and a device can only
use/mount one of them. The vbmeta.img needs to be generated per each
combination.

Bug:36701014
Test: sign custom image with AVB HASH descriptor (non-chain)
Test: sign custom image with AVB HASH descriptor as chain partition
Test: sign custom image with AVB HASHTREE descriptor (non-chain)
Test: sign custom image with AVB HASHTREE descriptor as chain partition
Change-Id: I492e2ce768e7caec22228b776b2c13a2d37a5b89
2017-08-25 13:28:57 +08:00
Bo Hu
22221a4f5a Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
am: 60df0a831c

Change-Id: I6b3976e5f96324ffa9474cd84ff94f278a9dde33
2017-08-14 18:49:42 +00:00
bohu
753e9e4462 emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-13 22:32:01 -07:00
Bo Hu
e6e2566f07 Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34 am: abd33cdba6 am: 1b86b7581c
am: d80d922083

Change-Id: I7bc9ad244fe32d494a1719338711579ce2aafc4b
2017-08-01 23:34:44 +00:00
Bo Hu
d80d922083 Merge "Revert "Revert "emulator: create qemu images for system,vendor""" am: 5af2027e34 am: abd33cdba6
am: 1b86b7581c

Change-Id: I0c8bf4c8db0cb783c7116d2f9d0734b98341401a
2017-08-01 23:30:23 +00:00
Bo Hu
abd33cdba6 Merge "Revert "Revert "emulator: create qemu images for system,vendor"""
am: 5af2027e34

Change-Id: I61b9598d6b69d74a42ad0dc445c866e3034ff638
2017-08-01 23:22:17 +00:00
Bo Hu
bc88ff69cf Revert "Revert "emulator: create qemu images for system,vendor""
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target

BUG: 64235252

Test: build sdk target successfully

(cherry picked from commit f0d50bbef0)

Change-Id: I813233c7c3f06eb1eca18aad5ea890a55814eb1b
2017-08-01 14:34:15 -07:00
Bo Hu
f0d50bbef0 Revert "Revert "emulator: create qemu images for system,vendor""
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target

Test: build sdk target successfully

Change-Id: Idb0bee56275f3bfe33ba7d29463e4b8e0699ec33
2017-08-01 13:00:53 -07:00
Bo Hu
c8aaab1f3f Merge "Revert "emulator: create qemu images for system,vendor"" am: a2ea9626e5 am: b7e5cf8b6d am: 471e2ba1d6
am: b0ca7302aa

Change-Id: Id5a4573dbaf9d2c7b3ad95592bf17edcb3264658
2017-08-01 07:10:37 +00:00
Bo Hu
b0ca7302aa Merge "Revert "emulator: create qemu images for system,vendor"" am: a2ea9626e5 am: b7e5cf8b6d
am: 471e2ba1d6

Change-Id: I89357469dfcb50f03771e733a41ea704801ce044
2017-08-01 07:07:07 +00:00
Bo Hu
b7e5cf8b6d Merge "Revert "emulator: create qemu images for system,vendor""
am: a2ea9626e5

Change-Id: I0118d5355aa3ffcd728b22e964609f02561df2db
2017-08-01 07:00:06 +00:00
Bo Hu
a2ea9626e5 Merge "Revert "emulator: create qemu images for system,vendor"" 2017-08-01 06:52:44 +00:00
Bo Hu
9b99ddc8a5 Revert "emulator: create qemu images for system,vendor"
This reverts commit b5d0503758.

Change-Id: Ie46a3a3dd99dec42673b3e3bd5b9085ca0480a8d
2017-08-01 06:50:07 +00:00
Colin Cross
acd9fe310b Merge "Fix test suite zip generation on mac" am: 94be321cae am: c1ed882bd8 am: 3f7ab5f080
am: ffcc178ba7

Change-Id: I40d4e59bf66882d87273631a50d6cb07e4345210
2017-08-01 04:11:40 +00:00
Colin Cross
ffcc178ba7 Merge "Fix test suite zip generation on mac" am: 94be321cae am: c1ed882bd8
am: 3f7ab5f080

Change-Id: Ie494bc225a72c454f48ac6cb30cf10e333afbcb6
2017-08-01 04:08:08 +00:00
Colin Cross
c1ed882bd8 Merge "Fix test suite zip generation on mac"
am: 94be321cae

Change-Id: Ied0e6233854db55e76498da2ca239ca6773ce59f
2017-08-01 04:01:37 +00:00
Treehugger Robot
94be321cae Merge "Fix test suite zip generation on mac" 2017-08-01 03:51:28 +00:00
bohu
34e0ca1577 Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7 am: dbbd3311ae am: fe3b305516
am: 69121fd68c

Change-Id: Ic31e0551981bc9ee48586a1c2222817610d4500a
2017-08-01 02:18:45 +00:00
bohu
69121fd68c Merge "emulator: create qemu images for system,vendor" am: 571e5d47b7 am: dbbd3311ae
am: fe3b305516

Change-Id: I5cb77655098ff078c4677e083843e5d7e4a57f07
2017-08-01 02:12:16 +00:00
bohu
dbbd3311ae Merge "emulator: create qemu images for system,vendor"
am: 571e5d47b7

Change-Id: Id80d452017384769146879bec205f39da79e37ae
2017-08-01 01:56:12 +00:00
Colin Cross
f3a4340435 Fix test suite zip generation on mac
Don't use sed -i, it requires an argument on mac and is eating the
-e parameter, which causes the command to not be applied.

Also clean up the temporary list files so they don't clutter up
$OUT.

Test: m -j device-tests
Bug: 64226094
Change-Id: Ie71820fc2d1cd812717bf0c156af011ca723e9f6
2017-08-01 01:51:30 +00:00
bohu
b5d0503758 emulator: create qemu images for system,vendor
For raw system.img and vendor.img do not have
partition table and init refuses to mount them
in first stage mounting.

For emulator build:
create partitioned system-qemu.img for system.img;
create partitioned vendor-qemu.img for vendor.img
if applicable.

Change-Id: I64fdcdafc303cf2f74a1e96653e7afe259f0af98
2017-07-31 16:28:40 -07:00
Bowgo Tsai
1799d360b5 Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740 am: 9a797706b5
am: 5cf6551455

Change-Id: I701c2708b9945f543e03b583d505ca947ebd63f6
2017-07-15 00:10:39 +00:00
Bowgo Tsai
5cf6551455 Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740
am: 9a797706b5

Change-Id: Ibdd8307b5cc72007d76929ca8c4db1ce20f33f15
2017-07-15 00:06:34 +00:00
Bowgo Tsai
bd91ac7740 Merge "custom_images: support verity fec (forward error correction)"
am: abf553c9d3

Change-Id: I4b6e678859538ac91fc2548fc7195677660af37c
2017-07-14 23:58:45 +00:00
Bowgo Tsai
8ec2a1cb08 custom_images: support verity fec (forward error correction)
Bug: 63691195
Test: `make custom_images` with CUSTOM_IMAGE_SUPPORT_VERITY_FEC := true
Test: boot device with the custom image built above

Change-Id: I198fa1e0697cb00712bbfb6f1a717ec623703ede
2017-07-14 21:47:13 +08:00
Howard Chen
133a64829e Merge "Support kernel modules in the odm image" am: 95a8c7e83f am: 1b0da968a0 am: e4b1bdaa9e
am: fd3340ee6f

Change-Id: I62b58c6cc623f1fa591ff2dc2a3eaefa9e30d995
2017-07-11 02:17:27 +00:00
Howard Chen
fd3340ee6f Merge "Support kernel modules in the odm image" am: 95a8c7e83f am: 1b0da968a0
am: e4b1bdaa9e

Change-Id: I70674dc5b25aa224b56df45ab526fc5addfe9846
2017-07-11 02:14:55 +00:00
Howard Chen
1b0da968a0 Merge "Support kernel modules in the odm image"
am: 95a8c7e83f

Change-Id: Ib34b1eb969b5fffba4040f40143ea1f3679d4913
2017-07-11 02:10:24 +00:00
Howard Chen
0c5f1e575d Support kernel modules in the odm image
This patch reuses the build-image-kernel-modules macro to build the
odm/lib/modules directory according to the BOARD_ODM_KERNEL_MODULES
which contains list of kernel module files.

Bug: 36012197
Test: android master build on pixel
Change-Id: I2c004132a89e7f230690b4d26c98c3d5b2769f11
2017-07-10 10:44:58 +08:00
Colin Cross
550381f515 Merge "Provide make variables for java binaries" am: 5e19557eb9 am: e885ccf0df am: d8a22925f5
am: 373a13c0ca

Change-Id: If5a60097dcd9986f468a2fbae8a7d23ed44f6453
2017-07-01 01:50:09 +00:00
Colin Cross
373a13c0ca Merge "Provide make variables for java binaries" am: 5e19557eb9 am: e885ccf0df
am: d8a22925f5

Change-Id: I8681d9c889018fe656f5ef4cc380d1a3af8c325f
2017-07-01 01:45:16 +00:00
Colin Cross
e885ccf0df Merge "Provide make variables for java binaries"
am: 5e19557eb9

Change-Id: Ib1be7da98214e3b6c27867b80005e18cc68a0d33
2017-07-01 01:36:14 +00:00
Colin Cross
0851df8c82 Provide make variables for java binaries
Replace java -> $(JAVA), etc. to prepare for moving java binaries
out of the path and using full paths to them.

Test: builds
Bug: 62956999
Change-Id: I5dfcd0d4e855ecde69cd127169e9545e59723d12
2017-07-01 01:03:14 +00:00
Dan Willemsen
d2a32cf66a Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb am: 616764b247 am: b2f7189479
am: 0e59a32e8f

Change-Id: I64201c181653b4a067988909b802c288ab3a515d
2017-06-21 03:40:44 +00:00
Dan Willemsen
0e59a32e8f Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb am: 616764b247
am: b2f7189479

Change-Id: Id6875b2ae03daec9d7b4547fa1c151cb5c12ebb9
2017-06-21 03:06:30 +00:00
Dan Willemsen
b2f7189479 Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb
am: 616764b247

Change-Id: I288d04b2e69c7f231f25905edcff19b31c6cf499
2017-06-21 03:00:30 +00:00
Dan Willemsen
f354b178b1 Support custom my_copy_pairs in package-modules.mk
To support extra files in package-modules.mk, allow the user to set
my_copy_pairs to a list of src:dest pairs that will be copied into the
zip file.

Test: build-aosp_arm.ninja is identical before/after
Test: codesearch says that these variables aren't otherwise used
Test: set my_copy_pairs, ensure that they exist in the zip.
Change-Id: Ia80cd136db8ad37a71010baf0552621b281c8bc3
2017-06-20 16:00:48 -07:00
Todd Lee
bae7ee5d9e add support for test suites with 'prebuilt tools'
- prebuilt tools copied directly to /tools subdir of zip
- currently only used by wts, noop for other suites

Bug: b/62102556
Change-Id: I796d7490f39f817af8f2ec5bea86593182bfcbe2
2017-06-09 17:58:51 +00:00
Bowgo Tsai
b3ce1ea72b Merge "Support signing custom images with AVB HASH or AVB HASHTREE" am: fe7aeb1de7 am: 16b64cbb58 am: 3989b738b8
am: b4c268eb7b

Change-Id: I516f6d60361e5397d32de0537dc1b1fa7bcc46a3
2017-05-31 03:42:56 +00:00
Bowgo Tsai
b4c268eb7b Merge "Support signing custom images with AVB HASH or AVB HASHTREE" am: fe7aeb1de7 am: 16b64cbb58
am: 3989b738b8

Change-Id: I11393e1833db97301ffdd31ec3db0968e87c1a24
2017-05-31 03:38:24 +00:00
Bowgo Tsai
7ea994b21c Support signing custom images with AVB HASH or AVB HASHTREE
`make custom_images` supports to build different kinds of *non-droid* images,
e.g., odm.img. Adding the support of signing them with either AVB HASH footer
or AVB HASHTREE footer. The user can use HASH for small images and
HASHTREE for large images.

Sample signing configurations:
 * AVB HASH footer:
   - CUSTOM_IMAGE_AVB_HASH_ENABLE := true
   - CUSTOM_IMAGE_AVB_ADD_HASH_FOOTER_ARGS := --append_to_release_string my_odm_image

 * AVB HASHTREE footer:
   - CUSTOM_IMAGE_AVB_HASHTREE_ENABLE := true
   - CUSTOM_IMAGE_AVB_ADD_HASHTREE_FOOTER_ARGS := --fec_num_roots 8

 * Using custom signing key:
   - CUSTOM_IMAGE_AVB_ALGORITHM := SHA256_RSA2048
   - CUSTOM_IMAGE_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem

Bug: 36701014
Test: `make custom_images` with AVB HASH footer
Test: `make custom_images` with AVB HASHTREE footer
Test: `make droid` to check system.img is still properly signed with AVB HASHTREE
Test: `make droid` to check vendor.img is still properly signed with AVB HASHTREE

Change-Id: I8dc420e12e37e9a631345c0cd883339db05d489f
2017-05-24 14:21:03 +08:00
Sen Jiang
f738df32b8 Merge "Add support for avbtool in custom_images." am: 8a8ca3438b am: 7cdc14d8b0 am: c900a7cd48
am: c5d5fdee22

Change-Id: I6682a91e7963308d7cbc41438b510addb70acb27
2017-05-16 18:14:43 +00:00
Sen Jiang
c5d5fdee22 Merge "Add support for avbtool in custom_images." am: 8a8ca3438b am: 7cdc14d8b0
am: c900a7cd48

Change-Id: I6612fc8c91ae83ff9da7fa7f78460f6d8249a687
2017-05-16 18:09:45 +00:00
Sen Jiang
5b0fe18feb Add support for avbtool in custom_images.
Set CUSTOM_IMAGE_AVB_ENABLE := true to enable avb, add_hashtree_footer
args can be added in CUSTOM_IMAGE_AVB_ADD_HASHTREE_FOOTER_ARGS.

Bug: 38319818
Test: m custom_images

Change-Id: Ia452dc5ce8b55bcbd3abba9e965b72e78fd8c104
2017-05-15 17:34:42 -07:00
Steven Thomas
10bd2af812 Update whitelisted package name for google vr
The vr platform lib was renamed from com.google.vr.gvr.platform to
com.google.vr.platform, so update the whitelist accordingly. Also narrow
the whitelist to just the .platform subpackage.

Bug: 38134403
Test: Booted a Marlin.
Change-Id: I9243ed3ab7a918e0bc716a7ddafe0b3c068700de
2017-05-11 01:54:14 -07:00
Narayan Kamath
22cad14a60 Merge "Build: Remove com.google from the boot classpath whitelist." 2017-05-03 09:58:11 +00:00
Colin Cross
5aeff27adf Merge "Sort inputs to compatibility suite zip files" am: 328290459d am: a2b1052ae2 am: ba89e33a6c
am: 151cd4c75c

Change-Id: I46c10478eb9d227b188b6eac4a806149d0630151
2017-05-03 02:55:18 +00:00