Commit Graph

50784 Commits

Author SHA1 Message Date
Chris Gross 397b3e5a68 Merge "Add a logging statement after soong ZIP runs in the merge_target_files.py step."
am: 5f4f4256eb

Change-Id: I0aad19c38301b3584ded759f20d41dd55c32f22c
2019-06-07 13:53:19 -07:00
Chris Gross 5f4f4256eb Merge "Add a logging statement after soong ZIP runs in the merge_target_files.py step." 2019-06-07 20:29:53 +00:00
Chris Gross eab4f0e2e9 Add a logging statement after soong ZIP runs in the
merge_target_files.py step.

Bug: 134681035
Test: Built a merged build and ensured that the new timestamp was
visible in the log.

Change-Id: Ia6bbda48c7f57afdb6482253eaf0b3b0ea067468
2019-06-07 13:15:52 -07:00
bohu 5b1eed6fbe emulator: add option to disable avb
avbtool spends considerate amount of time, we want
to disable it in build environment to make incremental
build speed a bit faster.

BUG: 133259713

lunch sdk_phone_x86-eng
export QEMU_DISABLE_AVB=true
make -j

Change-Id: I0d227fc5933aaab1d49f66f4b07b35922bc6255b
2019-06-07 09:50:51 -07:00
Hridya Valsaraju 6fab18a7eb Print a warning when sum of sizes of logical partitions an OEM-set limit
BOARD_SUPER_PARTITION_WARN_LIMIT can be set by OEMs to print
a warning when the sum of sizes of logical partitions exceed the same.
It is set to 95% of BOARD_SUPER_PARTITION_SIZE by default.

Bug: 133329143
Test: mmm -j32

Change-Id: I7d3bedd970a92be60991898e436f63d914359301
2019-06-07 09:50:47 -07:00
TreeHugger Robot b0120f8cdd Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master 2019-06-07 07:06:18 +00:00
Daniel Norman 1603c9311d Merge "Renames system to framework and other to vendor."
am: 6728fe850e

Change-Id: Iad4d3c73152bb2ba925e9f833ee4514afe309d9d
2019-06-06 14:27:04 -07:00
Daniel Norman 6728fe850e Merge "Renames system to framework and other to vendor." 2019-06-06 21:14:14 +00:00
Alistair Strachan c0e3153e3f Merge "Add misc_info.txt to rebuild super.img"
am: 95836d71e6

Change-Id: I7e2434d320111cb0119d06cfa868da806a39019a
2019-06-06 13:37:38 -07:00
Alistair Strachan 95836d71e6 Merge "Add misc_info.txt to rebuild super.img" 2019-06-06 20:23:17 +00:00
Colin Cross 4f60e366db Make kernel modules into normal installed files
We sometimes see build failures when building platform.zip happens
at the same time as building vendor.img if the vendor.img rule
runs rm -rf $OUT/vendor/lib/modules at the same time that platform.zip
is zipping $OUT/vendor/.  Move the kernel modules into normal
installation rules so that they are in place by the time either
the vendor.img or platform.zip rules run.

This will also cause the kernel modules to show up in
installed-files*.txt.

Test: m vendorimage && ls $OUT/vendor/lib/modules
Change-Id: I178b1d54bfcdb5cf5c29885ace9183ac28fc8826
2019-06-06 12:51:47 -07:00
Kalesh Singh de28abfbc9 Merge "Add ashmemd_hidl_client to base_vendor.mk product packages."
am: 6bfa11ed64

Change-Id: I4b4f792c8f73d677df7af760dff4407327eb5a62
2019-06-06 08:29:33 -07:00
Treehugger Robot 6bfa11ed64 Merge "Add ashmemd_hidl_client to base_vendor.mk product packages." 2019-06-06 15:18:27 +00:00
Martin Stjernholm 54b9c7e4cf Merge "Fix typo causing ALL_DEPS.$(module).ALL_DEPS to be incomplete."
am: ddd8b1e64f

Change-Id: If0050394af429eda5a75d34a3973a7254a8322c2
2019-06-06 02:48:15 -07:00
Martin Stjernholm ddd8b1e64f Merge "Fix typo causing ALL_DEPS.$(module).ALL_DEPS to be incomplete." 2019-06-06 09:37:15 +00:00
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
Daniel Norman d5d70ea555 Renames system to framework and other to vendor.
Also fixes small nit from previous change to write_sorted_data().

Bug: 132788610
Test: python -m unittest test_merge_target_files
Test: Creating and booting a merged build.
Change-Id: I3dc43a4fe55b86b436dec08feb5d70096d38de36
2019-06-05 16:47:15 -07:00
Xin Li 7906e029a0 DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master
Bug: 134605042
Change-Id: I95693ec9247275dbfb6eb8874dbaaf887ea989d7
2019-06-05 15:23:41 -07:00
Martin Stjernholm 43ee355406 Fix typo causing ALL_DEPS.$(module).ALL_DEPS to be incomplete.
Test: m droid, look at some ALL_DEPS values using $(info).
Change-Id: Ifc182a0545715343a677cb880e21062ce37f5e62
2019-06-05 21:49:34 +01: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
Isaac Chen 4e5e42b749 Add misc_info.txt to rebuild super.img
Include misc_info.txt (of CF's super.img) in *-img-*.zip.
This is needed if we want to rebuild super.img by replacing
some partitions in it.

Other tools, lpunpack and lpmake, are included in CF's
host package in another CL.

Bug: 134461288
Test: $ lunch aosp_cf_x86-userdebug
      $ m dist
      $ unzip -l $OUT/*-img-*.zip | grep misc_info
            619  2019-05-27 17:42   misc_info.txt

Change-Id: Idf6146c2a7f9f32c9c4e5ddd2f6b9e65fc6bf55b
2019-06-05 14:23:31 +08: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
android-build-team Robot dec688efc4 Make change and version bump to PPRL.190605.003
Change-Id: Ie8e1e74297d976017e2770ac08be67179a97ebd5
2019-06-05 02:06:47 +00: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
Kalesh Singh d1980fa4e3 Add ashmemd_hidl_client to base_vendor.mk product packages.
Change-Id: I77605e7129d4ffa6026f3546adbda61e59f50de0
Bug: 134161662
Test: m -j
2019-06-04 17:02:48 -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
Jooyung Han 4416b009e1 Ignore testcases' NOTICE files
$(BUILD_NATIVE_TEST) will install a test binary into /testcases
regardless of is proprietary or not.
For now, since NOTICE.xml for a system partition depends on all modules in
/testcases, "m systemimage" may trigger "installing a proprietary test".

Modules in /testcase are not actually installed, so we can ignore them
when we make a notice file.

Bug: 133454731
Test: (internal) m systemimage, and see /vendor/lib if there are
unexpected files installed.

Change-Id: I54ee51a761049b8a5ce9e3369b30b7ade6344146
2019-06-01 09:57:28 +09:00
android-build-team Robot 41965d4b5c Version bump to PQ3B.190705.003 [core/build_id.mk]
Change-Id: I4f3da2ed36bb41929f976c89c7d2d1f6558174bf
2019-05-31 12:24:18 +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