Commit Graph

48773 Commits

Author SHA1 Message Date
Anton Hansson 299ffb7870 Merge "Add more BoardConfig variables to stash list" 2019-02-22 10:21:07 +00:00
Logan Chien 7d35910451 Merge "Refine lsdump_paths.txt dependencies" 2019-02-22 09:08:03 +00:00
Logan Chien 5f4e29b090 Refine lsdump_paths.txt dependencies
This commit moves $(LSDUMP_PATHS) from the prerequisite of
lsdump_paths.txt to the prerequisite of findlsdumps. This change makes
it possible to dump the list of lsdump files without actually building
all lsdump files.

Bug: 124829578
Test: make out/target/product/generic/lsdump_paths.txt
      # does not build the actual lsdump files
Test: make findlsdumps  # builds lsdump_paths.txt and all lsdump files
Change-Id: I924f1c0c61391e958521c376a061651f2a301adb
2019-02-22 10:55:44 +08:00
Treehugger Robot f97ed91448 Merge "Add a wrapper file for the vts_config module." 2019-02-22 00:19:27 +00:00
Colin Cross 6128b1e8d6 Merge "Get DEXPREOPT_BOOT_JARS_MODULES from Soong" 2019-02-21 21:32:03 +00:00
Tianjie Xu df5978803d Merge "Dump a copy of metadata file for full OTA" 2019-02-21 18:00:55 +00:00
Colin Cross 0450863eca Merge "Update calls to dexpreopt_gen" 2019-02-21 15:00:40 +00:00
Anton Hansson 70222b21ee Add more BoardConfig variables to stash list
I would like to centralize/standardize the BoardConfig
variable sanity checking in a file similar to product_config.mk,
but for now just add a few more standard BoardConfig
variables to the .KATI_READONLY list.

Also fix the inconsistent indentation in this file.

Test: make
Change-Id: I2a878b95ffc07e3f5bc4eb4970775bdef347e094
2019-02-21 14:02:15 +00:00
Colin Cross 187c1b0741 Get DEXPREOPT_BOOT_JARS_MODULES from Soong
DEXPREOPT_BOOT_JARS_MODULES is not set any more in Make, stop
trying to pass it to Soong and let Soong export the value to Make.

Test: m checkbuild
Change-Id: I64de10236cbebc92c62fca137ae684e55cad1625
2019-02-20 21:46:31 -08:00
Colin Cross 36b5d1cd47 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.

This reapplies I97b1865fd98d5108d9c63ff7a90a5591c7622526 with
fixes to disable preopt for Soong-only builds when the global
dexpreopt.config doesn't exist.

Test: m checkbuild
Change-Id: I5af9b749235823b7e1cfcfc55e121bfec413fb2f
2019-02-20 21:46:15 -08:00
Colin Cross 5b8e3837d2 Merge "Revert "Update calls to dexpreopt_gen"" 2019-02-21 05:03:41 +00:00
Colin Cross 862ab81669 Revert "Update calls to dexpreopt_gen"
This reverts commit 1d8df4a97f.

Reason for revert: broke ndk build

Change-Id: I99ab62653fc15b985edd42301ec085ba68389f51
2019-02-21 05:03:11 +00:00
Bill Peckham 30ee35f908 Merge "Include merge_target_files.py deps in otatools.zip, use common argv processing." 2019-02-21 04:13:23 +00:00
Colin Cross bcc341e5b0 Merge "Update calls to dexpreopt_gen" 2019-02-21 04:06:18 +00:00
Tianjie Xu ef7737f921 Merge "Check the completeness of original blocks during target files validation" 2019-02-21 03:41:35 +00:00
Tianjie Xu 65cd6be679 Merge "OTA: Add an option to dump the metadata in ota package" 2019-02-21 03:04:55 +00: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
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
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
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 747bbbe163 Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" 2019-02-20 16:26:00 +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 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
Treehugger Robot eb0bbdc89a Merge "Install apexkeys.txt into the target-files package" 2019-02-20 01:53:44 +00: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
Yu Shan 655f17cf88 Add 32BIT and 16BIT nanopb library.
Add 32BIT and 16BIT compile time flag for nanopb library to support
16BIT or 32BIT size, default is 8BIT. User need to use the corresponding
library when define the PB_FIELD_* flag during compilation.

Change-Id: I0d25bcdf62d6b47733e1ad4bddbd4dfce2192b5d
Test: None
Bug: 122292884
2019-02-19 12:01:43 -08:00
Jiyong Park bcc8d8a2d4 Install apexkeys.txt into the target-files package
The file contains information about apex-to-keys mappings.

Bug: 124406181
Test: m dist and check if META/apexkeys.txt file exist in the
target-files package.

Change-Id: If8da917a8b4d4e8326614b34067c14ed0df59cb3
2019-02-19 14:18:46 +09:00
Colin Cross dd025116cd Merge "Remove dexpreopting of boot jars from Make" 2019-02-19 02:55:16 +00:00
Bowgo Tsai c1a8f1a5d7 GSI vbmeta.img: set rollback_index to zero
The major purpose of vbmeta.img built on GSI targets (e.g., aosp_arm,
aosp_arm64, etc) is to disable AVB. We should also set the rollback
index to zero, to prevent the device bootloader from updating the
last seen rollback index in the tamper-evident storage.

Bug: 122583908
Test: build aosp_arm64, then `avbtool info_image --image $OUT/vbmeta.img`
Change-Id: I48a49957f8dd3169003b9507fe80e519f301d5b5
2019-02-19 10:38:40 +08:00
Xin Li 8569735752 DO NOT MERGE - Merge PPRL.190205.001 into master
Bug: 124234733
Change-Id: I13bccc848fc7e7d883116c5f7c08079e27ec97a3
2019-02-18 15:57:59 -08:00
vichang cdaa9001fe Merge "Add a bug number in the TODO tag"
am: 4ea3ad0e34

Change-Id: I46a5d98cf9bf6a266c273f055eb61a19f35d39a1
2019-02-18 09:58:03 -08:00
vichang 4ea3ad0e34 Merge "Add a bug number in the TODO tag" 2019-02-18 17:51:53 +00:00
Victor Chang 575379e30b Add a bug number in the TODO tag
- ICU4C is kept in PRODUCT_PACKAGES for the app compat issue

Bug: 124218500
Test: Treehugger
Change-Id: I9b98321c639e99c59e6a5ea45dd380f5f731a419
2019-02-18 11:54:07 +00:00
Luca Stefani 15c83f9713 Merge "Fix flags argument passed to avbtool for GSI images"
am: 6867fd7dda

Change-Id: I59e0f4ce435535a6c1e6617061bb40d7ade7bfc3
2019-02-17 21:38:31 -08:00
Bowgo Tsai f509e54bd0 Merge "Support verifying system_other"
am: 01a05483ed

Change-Id: I343ac68c70195d2c9e035b92ef44f196fe731deb
2019-02-17 21:34:32 -08:00
Treehugger Robot 6867fd7dda Merge "Fix flags argument passed to avbtool for GSI images" 2019-02-18 05:27:52 +00:00
Treehugger Robot 01a05483ed Merge "Support verifying system_other" 2019-02-18 05:21:27 +00:00
Jeongik Cha d9182b546c Merge "Clean up noisy error log in find-shareduid-violation.py"
am: 50b4b395bc

Change-Id: I643ffdb62536e48c288ab6cfe902e081908213d1
2019-02-16 20:29:46 -08:00
Treehugger Robot 50b4b395bc Merge "Clean up noisy error log in find-shareduid-violation.py" 2019-02-17 04:19:41 +00:00
Roman Kiryanov af38e1765f Merge "Use predefined macros instead of hardcoding the path"
am: 06ec0577b6

Change-Id: I96baf1b12e11d7e7a4c4863dc9ed3c22c97c0568
2019-02-16 15:07:43 -08:00
Treehugger Robot 06ec0577b6 Merge "Use predefined macros instead of hardcoding the path" 2019-02-16 22:56:47 +00:00