Commit Graph

38387 Commits

Author SHA1 Message Date
SzuWei Lin 5677b877fb Force generic system image to load dex pre-opt from system
Generic system image always generates dex pre-opt in system image,
to improve the time of first boot.

But the property ro.cp_system_other_odex could be defined in vendor
image, so we disable the property in generic system image to force
dex pre-opt be loaded from system image.

Bug: 62645784
Test: Test the patch on a A/B project with GSI, confirm the dex
      pre-opt is loaded from GSI.

Change-Id: I71b4a5bed517841b5f889d21d73429fa91da25ba
2017-07-20 15:55:13 +08:00
SzuWei Lin 7e10169909 Share system properties with all GSI project with treble_system.prop
Use TARGET_SYSTEM_PROP to assign a common system property file in each
GSI BoardConfig.mk

Bug: 62647757
Test: make and check the file system/build.prop in out folder
Change-Id: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
2017-07-18 13:42:12 +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 d8a22925f5 Merge "Provide make variables for java binaries" am: 5e19557eb9
am: e885ccf0df

Change-Id: I28f7e020e23c629ef303222c3a8489fc6aa541d6
2017-07-01 01:40:45 +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
Treehugger Robot 5e19557eb9 Merge "Provide make variables for java binaries" 2017-07-01 01:25:10 +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
Bowgo Tsai c2fe53bad9 Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev am: 415024dcba
am: cea12fa14d

Change-Id: If481dbdde54417fde541f6b1bd900f614c5e346c
2017-06-30 16:48:10 +00:00
Bowgo Tsai cea12fa14d Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev
am: 415024dcba

Change-Id: I5ddfec3ba7bccd028255ae9729b29606ab220cfd
2017-06-30 16:39:41 +00:00
TreeHugger Robot 415024dcba Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev 2017-06-30 16:32:13 +00:00
Bowgo Tsai 9e95beab31 Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" in BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS
instead of INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS. The former setting will
be propogated to `make dist` while the latter is only used for `make`.

Bug: 38454093
Test: `make dist` and check vbmeta.img is being padded.
Change-Id: I929288b218761a4637a2a2ef0679d3ff85c70731
2017-06-30 12:13:15 +08:00
Dimitry Ivanov 7817c2b226 Merge "Add libdl.so to the list of system shared libs" am: b519d002f3 am: cd00be0767 am: b07838c082
am: 181713e34f

Change-Id: Ib3846df71ea350c5c7ef13045070fddd2a83e648
2017-06-29 22:29:36 +00:00
Dimitry Ivanov 181713e34f Merge "Add libdl.so to the list of system shared libs" am: b519d002f3 am: cd00be0767
am: b07838c082

Change-Id: I8a5fc05538b48f8ae086e6d25b30633225f8dfc3
2017-06-29 22:25:07 +00:00
Dimitry Ivanov b07838c082 Merge "Add libdl.so to the list of system shared libs" am: b519d002f3
am: cd00be0767

Change-Id: I994196c311525799c075476520a386d5fa22e2ed
2017-06-29 22:21:06 +00:00
Dimitry Ivanov cd00be0767 Merge "Add libdl.so to the list of system shared libs"
am: b519d002f3

Change-Id: I2d3d5daf26b7a78d68c02cf961bf43a71f19b0bf
2017-06-29 22:17:04 +00:00
Dimitry Ivanov b519d002f3 Merge "Add libdl.so to the list of system shared libs" 2017-06-29 22:12:03 +00:00
Dan Austin 82f6d9405f Merge "Update coverage sanitizer flags in make" am: 846bd7e00d am: dbe39cd069 am: 213d48e682
am: f445e283e2

Change-Id: I3e7f74f22dc6f5355261551d084895ac8aacf80f
2017-06-29 19:13:53 +00:00
Dan Austin f445e283e2 Merge "Update coverage sanitizer flags in make" am: 846bd7e00d am: dbe39cd069
am: 213d48e682

Change-Id: Ib4f92789fde658855600ed129e808531a5b54e55
2017-06-29 19:09:53 +00:00
Dan Austin 213d48e682 Merge "Update coverage sanitizer flags in make" am: 846bd7e00d
am: dbe39cd069

Change-Id: I5df5ea78d06479611e963eb6734085cd39dda7dd
2017-06-29 19:05:52 +00:00
Dan Austin dbe39cd069 Merge "Update coverage sanitizer flags in make"
am: 846bd7e00d

Change-Id: If5b06376ddb67ddecce4162ddeeb4828c35fa47f
2017-06-29 19:02:23 +00:00
Treehugger Robot 846bd7e00d Merge "Update coverage sanitizer flags in make" 2017-06-29 18:50:38 +00:00
Dan Austin 9978b5274c Update coverage sanitizer flags in make
Update the coverage sanitizer flags in make to use the new
flavor of coverage sanitization.

Bug: 63108942

Test: Test fuzzer runs with coverage guards.

Change-Id: I12bda1767b69d0d89557e5f8a91da50b0f137ff3
2017-06-29 08:53:02 -07:00
Tao Bao 09a403eb1b Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817 am: ce10b6e2f3 am: 1612f02ff2
am: 47743957f3

Change-Id: Ibdfe63e9a23243f1c14377edd2796cc487cc2359
2017-06-29 03:26:35 +00:00
Tao Bao 47743957f3 Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817 am: ce10b6e2f3
am: 1612f02ff2

Change-Id: If03509584275c1c0fc1f72f44cfb8fbfdfd4125b
2017-06-29 03:22:35 +00:00
Tao Bao 1612f02ff2 Merge "Allow packing custom radio images into target_files zip." am: 9ea6a8b817
am: ce10b6e2f3

Change-Id: I3b6f7ade42f58baa722e2ee3df81efac48a5b653
2017-06-29 03:19:02 +00:00
Tao Bao ce10b6e2f3 Merge "Allow packing custom radio images into target_files zip."
am: 9ea6a8b817

Change-Id: Ifdcdfa2214e4fa75bb0c7a5df1cb1796814fa7bc
2017-06-29 03:16:17 +00:00
Tao Bao 7e98d325fe Support replacing AVB signing keys. am: c218a470fb
am: abc7589479

Change-Id: If2068aedc86feb405095053b07c88a1c41f40c5a
2017-06-28 23:05:35 +00:00
Tao Bao abc7589479 Support replacing AVB signing keys.
am: c218a470fb

Change-Id: I7f7b1f6d5e4189b310f5eee6c839b56b0ded1887
2017-06-28 23:01:06 +00:00
Tao Bao 9ea6a8b817 Merge "Allow packing custom radio images into target_files zip." 2017-06-28 22:03:19 +00:00
TreeHugger Robot ec67d4fa1c Merge "cas: add CAS hal to build" 2017-06-28 20:37:25 +00:00
Tao Bao 5f41ea236c Merge "Support replacing AVB signing keys." am: 682849976d am: b5363b2dbc am: 118b3243f8
am: 7c58e8f438

Change-Id: Ib8377348149bc860b346a2c6b7297ec2c65bca61
2017-06-28 19:52:25 +00:00
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 5aae183307 Merge "Delay the write-back of misc_info in sign_target_files_apks.py." into oc-dr1-dev am: 7b8a7936dd
am: 0782db1b0f

Change-Id: Ia03a6c330414f6141b3f7875714c60a3e6e21ce4
2017-06-28 19:44:51 +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 c218a470fb 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
(cherry picked from commit 639118ff4d)
2017-06-28 12:38:32 -07: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 25ffd0b35d Merge "Update new HIDL interfaces in generic system image" into oc-dr1-dev am: e07c2ed19e
am: 87a643cfa1

Change-Id: Ida87aa7dde0bd0962dae4dd863575e9bca8d921d
2017-06-28 07:48:36 +00: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 622319d37c Merge "Move /default.prop to /system/etc/prop.default" into oc-dev-plus-aosp am: 5a7a3aca13 -s ours
am: 34b887f59d  -s ours

Change-Id: I1e001016a8976465e4052e02c927e04bc55cfefa
2017-06-28 06:35:52 +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 3545180d01 Merge "Move /default.prop to /system/etc/prop.default" into oc-dr1-dev am: 3b7460eda9
am: 331fd11216

Change-Id: I53b07ed74317bd69343d0b6d5919faf55a65c297
2017-06-28 06:34:36 +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