Commit Graph

50466 Commits

Author SHA1 Message Date
Tao Bao
d4680b2f33 Merge "Rebuild recovery-from-boot patch when calling add_img_to_target_files."
am: e55c0ae469

Change-Id: Ia2eb38f19deb6d57168707674ff70cffcc5d1032
2019-06-05 20:29:09 -07:00
Tao Bao
e55c0ae469 Merge "Rebuild recovery-from-boot patch when calling add_img_to_target_files." 2019-06-06 00:39:40 +00:00
Jimmy Chen
6a17707e57 Merge "Revert "Revert "Revert "Print full diagnostics file when Java process crashes.""""
am: 1e5fcc0d79

Change-Id: Id217a4a48f84af06390173507ea6ab96feed68c2
2019-06-05 03:12:10 -07:00
Treehugger Robot
1e5fcc0d79 Merge "Revert "Revert "Revert "Print full diagnostics file when Java process crashes."""" 2019-06-05 09:53:22 +00:00
Jimmy Chen
7a8690455f Revert "Revert "Revert "Print full diagnostics file when Java process crashes."""
This reverts commit 1e3ad0eb5d.

Reason for revert: break build

Change-Id: I43022f556d5b73956d44cdda43b0b2499225b123
2019-06-05 06:47:03 +00:00
Tao Bao
4978fa99d1 Rebuild recovery-from-boot patch when calling add_img_to_target_files.
When using Verified Boot 2.0, releasetools specifies a salt value based
on build fingerprint, so that to give idempotent images.

However, the change that removed static `ro.build.fingerprint` [1] broke
the behavior, as common.LoadInfoDict still relies on fingerprints.
Without a fixed salt, the first call to make_recovery_patch.py and the
second one (which writes IMAGES/{boot,recovery}.img) will see different
images, which leads to install-recovery.sh failure.

Note that currently there's a dependency that requires getting bootable
images through two separate calls. make_recovery_patch.py has to happen
first to get (placeholder) files in the system image. We then generate
canned fs_config files, and finally use add_img_to_target_files.py to
write the images.

This CL adds a quick workaround to force rebuilding the
recovery-from-boot patch while calling add_img_to_target_files.py.

[1] https://android-review.googlesource.com/c/platform/build/+/892933

Bug: 134123803
Bug: 134525174
Test: TreeHugger
Test: Build a non-A/B target that uses AVB. Run validate_target_files.py
      on the generated target_files.zip.
Change-Id: I5859e30be63bfd54398cf41fd2d907f15285f560
2019-06-04 22:44:45 -07:00
Yasuhiro Kubota
365cdd419d Merge "Changes.md: Change OUT_DIR to PRODUCT_OUT"
am: ec2772d2be

Change-Id: Id8ea12b491cea23a05eaab07afd525351258183d
2019-06-04 18:04:47 -07:00
Tao Bao
01ca117595 Merge "releasetools: Allow verifying chained vbmeta partitions."
am: 23def8793d

Change-Id: Iefbf9a8a8808db8f005652f55b5ecbe043acdcfe
2019-06-04 17:54:11 -07:00
Treehugger Robot
ec2772d2be Merge "Changes.md: Change OUT_DIR to PRODUCT_OUT" 2019-06-04 22:06:49 +00:00
Tao Bao
23def8793d Merge "releasetools: Allow verifying chained vbmeta partitions." 2019-06-04 21:23:09 +00:00
Tao Bao
08c190fc89 releasetools: Allow verifying chained vbmeta partitions.
Chained vbmeta partitions (vbmeta_system, vbmeta_vendor) were added to
support dynamic partitions. validate_target_files.py misses the logic in
handling such partitions.

Bug: 132882632
Test: Run validate_target_files.py on a target_files.zip that uses
      chained vbmeta_system partition.
Change-Id: Id06c575d13d5e9cc1b621f485ceb75d3e354c39f
Merged-In: Id06c575d13d5e9cc1b621f485ceb75d3e354c39f
(cherry picked from commit 814b14b3f7)
2019-06-04 12:49:41 -07:00
Alexander Smundak
f6e6eb1dc1 Merge "Revert "Revert "Print full diagnostics file when Java process crashes."""
am: a9266be96f

Change-Id: I5f4aeec1f31fb11a0ef76ebef9fb7889c03b9b6b
2019-06-04 12:47:33 -07:00
Treehugger Robot
a9266be96f Merge "Revert "Revert "Print full diagnostics file when Java process crashes.""" 2019-06-04 17:16:10 +00:00
Yasuhiro Kubota
cd301f6722 Changes.md: Change OUT_DIR to PRODUCT_OUT
"OUT" means "out/target/proudct/<product>/".
But "OUT_DIR" means "out/".
So we can't use "OUT_DIR" instead of "OUT".

We can use "PRODUCT_OUT" instead of "OUT" which means same folder.

Test: N/A Just document modification
Change-Id: Id08664ba48b226ead7ab6b00d0291259d3a737ba
2019-06-04 20:49:51 +09:00
Tri Vo
f61d6b97dd Merge "Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS""
am: f4a8b6415f

Change-Id: I942327f1d4ac1c533d9732f2a4daa47e51975529
2019-06-03 13:26:52 -07:00
Tri Vo
f4a8b6415f Merge "Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"" 2019-06-03 20:14:01 +00:00
Anton Hansson
bbef3c75a5 Merge "core/main: Strip bitness before existence check"
am: 9c560f17a8

Change-Id: Ic07705ece5884935ec6f6241d3f203e958e3c2c9
2019-06-03 12:05:28 -07:00
Anton Hansson
9c560f17a8 Merge "core/main: Strip bitness before existence check" 2019-06-03 18:47:30 +00:00
Alexander Smundak
1e3ad0eb5d Revert "Revert "Print full diagnostics file when Java process crashes.""
This reverts commit 6c77a6baa6.

Reason for revert: aog/974065 fixes the problem that caused the revert

Change-Id: I935f78762b23ac63a79a9529515ff4ef394d5c3c
2019-06-03 16:55:13 +00:00
Daniel Norman
de3007658e Merge "Adds validation check that certain partitions come from a single build."
am: 206ef1f4fb

Change-Id: I1ef19970c1944ad6257b3fd1c3dba6ee8488a437
2019-06-03 07:34:18 -07:00
Treehugger Robot
206ef1f4fb Merge "Adds validation check that certain partitions come from a single build." 2019-06-03 14:24:14 +00:00
Felix
b56b25157c core/main: Strip bitness before existence check
Strip bitness information for PRODUCT_PACKAGES and
PRODUCT_HOST_PACKAGES before checking against ALL_MODULES.

Also correct spelling: nonexistant -> nonexistent

Bug:
If PRODUCT_ENFORCE_PACKAGES_EXIST was set, the build system would
complain about nonexistent packages for e.g. HALs where the bitness was
specified using a suffix, such as android.hardware.audio@4.0-impl:32

Test:
Add android.hardware.audio@4.0-impl:32 to PRODUCT_PACKAGES, specify
PRODUCT_ENFORCE_PACKAGES_EXIST, ensure no whilelist is set.
"make systemimage vendorimage" -> No error.

Signed-off-by: Felix <google@ix5.org>
Change-Id: Id59460a19320aa9437b8805411a0d97fa6432633
2019-06-03 14:10:33 +02:00
Alexander Smundak
596bad5433 Merge "Fix dump-vars output to handle quotes."
am: 1270511080

Change-Id: I42c07d48964da1c61648b36498632d73c42f96ec
2019-06-02 16:01:25 -07:00
Alexander Smundak
1270511080 Merge "Fix dump-vars output to handle quotes." 2019-06-02 22:40:23 +00:00
Tri Vo
790db2fc79 Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"
Bug: 133196056
Test: m selinux_policy
Change-Id: I194167cc33ed9b0367dd3edfd5d954af5c1b4a13
2019-06-01 17:06:07 -07:00
Daniel Norman
edf124780f Adds validation check that certain partitions come from a single build.
This is to prevent a user from accidentally including files from the
wrong build. For example, adding any SYSTEM/ line to other_item_list
while keeping SYSTEM/* in system_item_list would cause the other build
to introduce an extra or changed file in the system image.

Bug: 132730710
Test: python -m unittest test_merge_target_files
Change-Id: Ic1178cdc9b991114f293ff3f2b4e6054e06647c6
2019-06-01 04:39:46 +00:00
Alexander Smundak
f9f97fbd2d Merge "Revert "Print full diagnostics file when Java process crashes.""
am: 3134681218

Change-Id: Ifeb49b1a27d955979fa7cdaef5578f0111cea0be
2019-05-31 02:51:29 -07:00
Treehugger Robot
3134681218 Merge "Revert "Print full diagnostics file when Java process crashes."" 2019-05-31 09:37:36 +00:00
Sasha Smundak
23a44f1b05 Fix dump-vars output to handle quotes.
Bug: 132766811
Test: treehugger
Change-Id: I4c054343cd11a089d93b7386b8d8ba04a7b6b77e
2019-05-30 20:59:50 -07:00
Alexander Smundak
6c77a6baa6 Revert "Print full diagnostics file when Java process crashes."
This reverts commit 09fd82ea89.

Reason for revert: This change set the value of JAVA make variable to a string containing "foo bar". When soong_ui is asked to evaluate such string, it drops the quotes, causing bash to treat 'foo' and 'bar' as separate command line arguments.

Change-Id: I81e07c4cd333751d185dc50c49d0638f6511727e
2019-05-31 03:15:09 +00:00
patricktu
f50f92ca7d Merge "AIDEGen: Add the java sources of host java library modules into module-info.json."
am: a628af2a42

Change-Id: Iba5538fd15c9d85b3d45c1ad67fadd07553115b2
2019-05-30 18:13:01 -07:00
Treehugger Robot
a628af2a42 Merge "AIDEGen: Add the java sources of host java library modules into module-info.json." 2019-05-31 01:04:05 +00:00
Sasha Smundak
2d8f0f846c Merge "Print full diagnostics file when Java process crashes."
am: 81feca7af2

Change-Id: I2ec8131bac8f338a3ad36de2131b83b328032f70
2019-05-30 14:36:03 -07:00
Treehugger Robot
81feca7af2 Merge "Print full diagnostics file when Java process crashes." 2019-05-30 21:16:51 +00:00
Alan Viverette
44031d0fe5 Merge "Remove obsolete Support Library guidance from version_defaults.mk"
am: 8446ef89bd

Change-Id: I47253e386a46655f8ffc16435ad1620c23bc24d9
2019-05-30 13:45:44 -07:00
Treehugger Robot
8446ef89bd Merge "Remove obsolete Support Library guidance from version_defaults.mk" 2019-05-30 20:09:33 +00:00
Tao Bao
91dda1066d Merge "Obsolete PRODUCT_STATIC_BOOT_CONTROL_HAL."
am: f4d18a0d11

Change-Id: I03433417dcd0853a3c10303390176d14b6f54e38
2019-05-30 10:06:01 -07:00
Felix
ebfacd2c44 Merge "fs_config: Fix cases without vendor/oem partition"
am: 2d33715f1c

Change-Id: Ia38fcd43e5112de472fd6b9290793a95589a5b82
2019-05-30 10:05:30 -07:00
Alan Viverette
fef7f43401 Remove obsolete Support Library guidance from version_defaults.mk
Test: n/a docs only
Fixes: 133228727
Change-Id: Idbc56e1d53a5752ce07a47b41273b403187b24e9
2019-05-30 12:54:54 -04:00
Tao Bao
f4d18a0d11 Merge "Obsolete PRODUCT_STATIC_BOOT_CONTROL_HAL." 2019-05-30 16:47:22 +00:00
Treehugger Robot
2d33715f1c Merge "fs_config: Fix cases without vendor/oem partition" 2019-05-30 16:41:34 +00:00
Kalesh Singh
bf87f1d7a6 Merge "Ashmem VNDK library list update"
am: 523362d544

Change-Id: I860713c9a4983c5d470b97eec92e912cb9538997
2019-05-30 00:47:03 -07:00
Treehugger Robot
523362d544 Merge "Ashmem VNDK library list update" 2019-05-30 07:36:41 +00:00
Sasha Smundak
09fd82ea89 Print full diagnostics file when Java process crashes.
Bug: 132766811
Test: treehugger
Change-Id: Id415c01559a941b793b03647354be136fa64d9a7
2019-05-29 17:46:57 -07:00
Felix
8453f02c65 fs_config: Fix cases without vendor/oem partition
If the device has neither an OEM nor a vendor partiton,
$PRIVATE_PARTITION_LIST will be empty, causing the fsconfig tool to fail
because the "--all-partitions" argument will be empty.

Quote the comma-substituted "$(PRIVATE_PARTITION_LIST)" - which may be
empty - to appease argparse, which will then populate "_all_partitions"
with an empty "str" object.

Checking _all_partitions against None is superfluous since either
argparse will catch the empty argument and fail early, or the argument
will be a string, in which case it will not be None.

Signed-off-by: Felix <google@ix5.org>
Change-Id: I236e30445b303b4945467b5dc4387d54b5d984f9
2019-05-29 22:24:05 +02:00
Jaewoong Jung
aec3dad7f4 Merge "Deprecate inherit-package."
am: cd56c0df95

Change-Id: I0fab8ddb03c600ad3fc581543b3aed0373f4fa33
2019-05-29 13:19:58 -07:00
Jaewoong Jung
cd56c0df95 Merge "Deprecate inherit-package." 2019-05-29 19:48:46 +00:00
Tao Bao
84f88a473a Obsolete PRODUCT_STATIC_BOOT_CONTROL_HAL.
Bug: 34254109
Test: TreeHugger
Test: Define PRODUCT_STATIC_BOOT_CONTROL_HAL and see the expected
      failure after lunch.
Change-Id: I914b84e874fe14a25dcfe56b282c56f88934d07c
2019-05-29 11:38:16 -07:00
Colin Cross
7067b08019 Merge "Move verify_uses_libraries.sh out of dexpreopt"
am: 2459515d3a

Change-Id: Ibbd2b86ea4c54ac192ea01630720f8895e7c4e3f
2019-05-29 11:22:51 -07:00
Treehugger Robot
2459515d3a Merge "Move verify_uses_libraries.sh out of dexpreopt" 2019-05-29 18:09:01 +00:00