Commit Graph

52344 Commits

Author SHA1 Message Date
Colin Cross
fbc0661520 Merge "Fix boot_profile_jars.zip" am: 7ccf993d17
am: a7072ee157

Change-Id: Id9ea75c94382824314f3dc9cc6cc27b128b4eafb
2019-02-20 16:54:11 -08:00
Bill Peckham
f753e15791 Include merge_target_files.py deps in otatools.zip, use common argv processing.
The merge_target_files.py script needs fc_sort and sefcontext_compile, so
include these tools into otatools.zip via core/Makefile.

Modify tools/releasetools/merge_target_files.py to use the otatools common argv
processing to take advantage of the '--path' option so that we add point the
'--path' option to an extracted otatools.zip package to gain access to fc_sort,
sefcontext_compile, and soong_zip (previously included in otatools.zip).

Bug: 123600124
Test: extract otatools.zip, use --path option to point to it, verify result
Change-Id: I7d84525981b8741c6bdbcac9984256920fc7f417
2019-02-21 00:50:54 +00:00
Colin Cross
a7072ee157 Merge "Fix boot_profile_jars.zip"
am: 7ccf993d17

Change-Id: I9fb8e9281453ec1bdd0b1556ac69a9d11b3c081e
2019-02-20 16:28:49 -08:00
Treehugger Robot
7ccf993d17 Merge "Fix boot_profile_jars.zip" 2019-02-21 00:08:17 +00:00
xunchang
c0f77ee489 Check the completeness of original blocks during target files validation
The validate_target_files.py checks the 'incomplete' field of the range
in file_map. And range has already considered the shared blocks and
could be smaller in size than the original file range. Therefore, the
'incomplete' flag was set on the original range in common.py; and we
should switch to use the original range also during validation.

I also checked another flag usage in CanUseImgdiff(), and it has
explicitly rejected cases of shared blocks.

Bug: 124868891
Test: unit tests pass
Change-Id: I03959625d7b81fd83420db98f01d23f54064bcd2
2019-02-20 15:47:30 -08:00
xunchang
3b548b0302 Dump a copy of metadata file for full OTA
When building the full OTA file, write a copy of the metadata to the
dist dir. Then it will show up in the artifact of the build page for
users to parse.

Bug: 124783265
Test: make dist and check the output metadata
Change-Id: I2eb06bbf3cbb9f3653ca3352f3d601b09403d59d
2019-02-20 15:32:28 -08:00
xunchang
1cfe25155e OTA: Add an option to dump the metadata in ota package
Add a flag to write a copy of the metadata to a separate file. Therefore,
users can read the post build fingerprint without extracting the OTA package.

Bug: 124783265
Test: Check the dumped metadata file after generate A/B and non-A/B OTA.
Change-Id: I8918aec87bb81906ef0a7eee774178e9f689d91d
2019-02-20 15:32:09 -08:00
Nicolas Geoffray
aa33b73982 Merge "Set a dedicated variable for the runtime apex libs." am: 5fa7e2fa2c am: acd4006aec
am: b0eafab494

Change-Id: I755b6de5a76a614fd54f5770ef0729444500bbdb
2019-02-20 13:57:34 -08:00
Nicolas Geoffray
1966c28314 Merge "Remove obsolete rule." am: cffe5bb1f3 am: d28c2b16ca
am: 5a7ff6d908

Change-Id: I33981bb482bb95bc8af43615313d53eb756a56cc
2019-02-20 13:56:00 -08:00
Nicolas Geoffray
b0eafab494 Merge "Set a dedicated variable for the runtime apex libs." am: 5fa7e2fa2c
am: acd4006aec

Change-Id: Id1968c8611865753f3604138779c852195b69935
2019-02-20 13:12:16 -08:00
Dan Willemsen
7218a21ed0 First pass at creating PRODUCT_HOST_PACKAGES
This only defines PRODUCT_HOST_PACKAGES as a concept, and requires that
it contain at least all of the files that would be installed to the host
from PRODUCT_PACKAGES (minus libraries, as those are expected to be
installed based on what's required by other modules).

It does not actually change what will be built, that will happen in a
future change.

Test: build/soong/build_test.bash
Change-Id: Ie502b1a483f821b957cfd407c31a93e243896dae
2019-02-20 12:58:37 -08:00
Nicolas Geoffray
5a7ff6d908 Merge "Remove obsolete rule." am: cffe5bb1f3
am: d28c2b16ca

Change-Id: Ie483185114bfd9aec9c3c42ddd70855b17bbe00a
2019-02-20 12:56:45 -08:00
Yu Shan
d1b52f2247 Merge "Add 32BIT and 16BIT nanopb library." am: a83858dc37 am: c370e7a8bd
am: 9c257a2be5

Change-Id: Icd7f136d7d76ce2c72e30bb3c475dea4c7aee659
2019-02-20 12:50:29 -08:00
Nicolas Geoffray
acd4006aec Merge "Set a dedicated variable for the runtime apex libs."
am: 5fa7e2fa2c

Change-Id: I559f6e96f4d97bf29aa726bde7dc17bea9984c08
2019-02-20 12:46:11 -08:00
Colin Cross
d8badf5b8b Fix boot_profile_jars.zip
Some of the inputs to boot_profile_jars.zip have moved outside
of $(PRODUCT_OUT), update the -C argument to soong_zip to point
to the right directory.

Also make the rule to build the zip always present, and only gate
the dist command behind PRODUCT_DIST_BOOT_AND_SYSTEM_JARS.

Test: m out/target/product/blueline/boot_profile_jars.zip
Change-Id: Iaa72be955edda445f3eab041a63f79c9055d6b33
2019-02-20 20:44:58 +00:00
Nicolas Geoffray
d28c2b16ca Merge "Remove obsolete rule."
am: cffe5bb1f3

Change-Id: I86dc89cd23dd778fff816838a4612c38cbcd3ccc
2019-02-20 12:30:51 -08:00
Yu Shan
9c257a2be5 Merge "Add 32BIT and 16BIT nanopb library." am: a83858dc37
am: c370e7a8bd

Change-Id: Id719c201cb9b0c507de4e7aedceaaacf6608dcb6
2019-02-20 12:22:04 -08:00
Yu Shan
c370e7a8bd Merge "Add 32BIT and 16BIT nanopb library."
am: a83858dc37

Change-Id: Ib2bed50e6d4c31b269d4b2ea1f3e13457959d871
2019-02-20 12:09:46 -08:00
Xin Li
f4b0f846f7 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: 747bbbe163 -s ours am: 916c1af574 -s ours
am: 12b80b798d -s ours
am skip reason: subject contains skip directive

Change-Id: I05608f2ad7a9823559d89138cbddb24639063641
2019-02-20 11:15:24 -08:00
Colin Cross
1d8df4a97f Update calls to dexpreopt_gen
dexpreopt_gen now requires a -out_dir argument, and does not need
DexPath, StripInputPath and StripOutputPath set.

Also use paths to Soong binaries for dex2oat, profman and aapt
so that they can be loaded as Path objects in Soong, and let
Soong handle the default for BootImageProfiles.

Test: m checkbuild
Change-Id: I97b1865fd98d5108d9c63ff7a90a5591c7622526
2019-02-20 11:14:14 -08:00
Nicolas Geoffray
5fa7e2fa2c Merge "Set a dedicated variable for the runtime apex libs." 2019-02-20 18:42:46 +00:00
Nicolas Geoffray
cffe5bb1f3 Merge "Remove obsolete rule." 2019-02-20 18:32:10 +00:00
Yu Shan
a83858dc37 Merge "Add 32BIT and 16BIT nanopb library." 2019-02-20 18:23:29 +00:00
Xin Li
3a24f83c82 [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 8569735752 -s ours am: 4503d33b11 -s ours
am: 87ff207f4a -s ours
am skip reason: subject contains skip directive

Change-Id: I4183b56b14aec6cfc825d136c67d055fcb84d5ac
2019-02-20 10:07:22 -08:00
Xin Li
12b80b798d [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: 747bbbe163 -s ours
am: 916c1af574 -s ours
am skip reason: subject contains skip directive

Change-Id: I45e599a1f24e302a2f9f4746bdb52054f2638db2
2019-02-20 09:56:55 -08:00
Xin Li
916c1af574 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am: 747bbbe163 -s ours
am skip reason: subject contains skip directive

Change-Id: I409a3bef97fb886b76a267cbd7fb38e532cf05a4
2019-02-20 09:33:41 -08:00
Xin Li
87ff207f4a [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 8569735752 -s ours
am: 4503d33b11 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia5b571048eb5321246e18843dc8a32d2e3511a3b
2019-02-20 09:16:23 -08:00
Xin Li
4503d33b11 [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am: 8569735752 -s ours
am skip reason: subject contains skip directive

Change-Id: I8090b428860f9cd548bbdb109701d0a12ab0e52a
2019-02-20 08:38:26 -08:00
Xin Li
747bbbe163 Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" 2019-02-20 16:26:00 +00:00
Orion Hodson
13ef2eb458 Add libartpalette-system
Test: ssh to mac, lunch, build, flash, boot device.

Change-Id: Iddeb6b7e69edbf260be1148428fd9aa468d4559d
2019-02-20 13:36:07 +00:00
Nicolas Geoffray
02c6848b1a Remove obsolete rule.
We don't strip boot classpath anymore.

Test: m
Change-Id: I516bbac92d896c9e00a634a33f2856bd18fc75d5
2019-02-20 10:15:24 +00:00
Nicolas Geoffray
f026d899f4 Set a dedicated variable for the runtime apex libs.
Bug: 124789867
Test: build with coverage, the boot classpath has jacoco.jar in /system/framework, not the apex
Change-Id: I2529f8fcb4ef30454a9e5fc95d58d31bef83ec6f
2019-02-20 10:05:17 +00:00
Tianjie Xu
8b8de7470e Merge "Add a flag to skip compatibility check" am: 79b52c9ce1 am: 2d97c96527
am: 0875e002aa

Change-Id: Ieaf6975f1ac2eb6d344b89334e8d040f8b24d769
2019-02-19 21:26:06 -08:00
Jim Tang
8d41d3eff5 Merge "Add Asuite prebuilds in PATH and remove functions." am: 0201a19ba8 am: 617f5f3ca9
am: cc1ecaf263

Change-Id: I47376481da385522d9cc313e2eb0eff5a3dd338e
2019-02-19 21:23:49 -08:00
Tianjie Xu
0875e002aa Merge "Add a flag to skip compatibility check" am: 79b52c9ce1
am: 2d97c96527

Change-Id: Iaac01a8fa0a37e623f32cc93416a6eafcf264ab2
2019-02-19 21:17:34 -08:00
Jim Tang
cc1ecaf263 Merge "Add Asuite prebuilds in PATH and remove functions." am: 0201a19ba8
am: 617f5f3ca9

Change-Id: Ia1529a995b8b2e651a2555d7a102f74d40d16655
2019-02-19 21:15:35 -08:00
Tianjie Xu
2d97c96527 Merge "Add a flag to skip compatibility check"
am: 79b52c9ce1

Change-Id: Idb7f2ff506e060000f30288e51853a4c7ab873c0
2019-02-19 21:07:00 -08:00
Jim Tang
617f5f3ca9 Merge "Add Asuite prebuilds in PATH and remove functions."
am: 0201a19ba8

Change-Id: Ic895992486e38307ff61359682ec0d5ee8afb66e
2019-02-19 21:03:26 -08:00
Tianjie Xu
79b52c9ce1 Merge "Add a flag to skip compatibility check" 2019-02-20 05:02:52 +00:00
Treehugger Robot
0201a19ba8 Merge "Add Asuite prebuilds in PATH and remove functions." 2019-02-20 04:51:03 +00:00
Tri Vo
62d51b65aa recovery: install product_file_contexts and product_property_contexts
Product partition is not mounted in recovery mode. Install
product_file_contexts and product_property_contexts into rootdir for
recovery. This is similar to how we deal with system, vendor, and odm
*_contexts files.

And remove unnecessary ifdefs.

Test: m bootimage for pixel 3, product_file_contexts and
product_property_contexts appear in $OUT/recovery/root/
Change-Id: I416d9e6ea742e67a6fe294f1ad8b78fb9b844260
2019-02-19 18:32:55 -08:00
Jiyong Park
66cb219721 Merge "Install apexkeys.txt into the target-files package" am: eb0bbdc89a am: 26919ea581
am: 34487082ec

Change-Id: Ifee9fad27540e42a22e9f741092224c6d4041d17
2019-02-19 18:15:50 -08:00
Jiyong Park
34487082ec Merge "Install apexkeys.txt into the target-files package" am: eb0bbdc89a
am: 26919ea581

Change-Id: I1df04af86a2fca2f03fa16bff9362e01e7f6780e
2019-02-19 18:11:24 -08:00
Jiyong Park
26919ea581 Merge "Install apexkeys.txt into the target-files package"
am: eb0bbdc89a

Change-Id: Ie182fa94a420ab9dc3dd9b55544e05f958cd8b60
2019-02-19 18:06:14 -08:00
Bowgo Tsai
cf82764987 Merge "GSI vbmeta.img: set rollback_index to zero" am: 93030e3f4d am: 8ef0dae2c6
am: 12d9c24978

Change-Id: Ic8e133ef3ff8743806086b0f06afb6ab64b6d0de
2019-02-19 17:54:52 -08:00
Treehugger Robot
eb0bbdc89a Merge "Install apexkeys.txt into the target-files package" 2019-02-20 01:53:44 +00:00
Bowgo Tsai
12d9c24978 Merge "GSI vbmeta.img: set rollback_index to zero" am: 93030e3f4d
am: 8ef0dae2c6

Change-Id: Iaf0481f4a90a859027bc9b753176cec3840f209e
2019-02-19 17:42:06 -08:00
Bowgo Tsai
8ef0dae2c6 Merge "GSI vbmeta.img: set rollback_index to zero"
am: 93030e3f4d

Change-Id: I6adee5828866fab679fc320959c2c3a02dc577ff
2019-02-19 17:33:54 -08:00
Treehugger Robot
93030e3f4d Merge "GSI vbmeta.img: set rollback_index to zero" 2019-02-20 01:20:09 +00:00
xunchang
abfa265f81 Add a flag to skip compatibility check
This serves as a workaround to skip the compatibility check for devices
with incompatible kernels.

Bug: 114240221
Test: generate and check the OTA package for wear device
Change-Id: I65b523a66648af7a77fc3ea79176764fe8ae8d02
2019-02-19 16:27:10 -08:00