aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-10Merge "Add a host simulation of the tzdata module"temp-PPRL.190605.003Neil Fuller
am: 69324709f8 Change-Id: Idc4ccd533fcfb12ad6161855fde7a149f5c030e8
2019-06-10Merge "Add a host simulation of the tzdata module"Neil Fuller
2019-06-10Add a host simulation of the tzdata moduleNeil Fuller
Sets up additional files so that host environments can now have a simulation of the time zone data mainline module in addition to the simulation of the runtime mainline module they already have. Bug: 132169989 Test: Treehugger only Exempt-From-Owner-Approval: Cherry-pick; already approved internally Merged-In: I43dadb150e359bbcb9da61e0187286ac6d38f7c2 Change-Id: I43dadb150e359bbcb9da61e0187286ac6d38f7c2
2019-06-10Merge "Make mainline device use apex"Anton Hansson
am: b3cb9284e8 Change-Id: I4cb3d588b6fab12364fba0a4a8cba224ce91c50d
2019-06-10Merge "Make mainline device use apex"Treehugger Robot
2019-06-10Make mainline device use apexAnton Hansson
The build system default was changed to not support apex, but we want the mainline device to enable it. Also re-disable it for GSI. Test: make Change-Id: I9a4372d375c2c741d7de5b2f83cac3c4b08767f8 Merged-In: I9a4372d375c2c741d7de5b2f83cac3c4b08767f8
2019-06-07Merge "Add a logging statement after soong ZIP runs in the ↵Chris Gross
merge_target_files.py step." am: 5f4f4256eb Change-Id: I0aad19c38301b3584ded759f20d41dd55c32f22c
2019-06-07Merge "Add a logging statement after soong ZIP runs in the ↵android-o-mr1-iot-release-1.0.13Chris Gross
merge_target_files.py step."
2019-06-07Add a logging statement after soong ZIP runs in theChris Gross
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-07Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into ↵TreeHugger Robot
stage-aosp-master" into stage-aosp-master
2019-06-06Merge "Renames system to framework and other to vendor."Daniel Norman
am: 6728fe850e Change-Id: Iad4d3c73152bb2ba925e9f833ee4514afe309d9d
2019-06-06Merge "Renames system to framework and other to vendor."Daniel Norman
2019-06-06Merge "Add misc_info.txt to rebuild super.img"Alistair Strachan
am: 95836d71e6 Change-Id: I7e2434d320111cb0119d06cfa868da806a39019a
2019-06-06Merge "Add misc_info.txt to rebuild super.img"Alistair Strachan
2019-06-06Merge "Add ashmemd_hidl_client to base_vendor.mk product packages."Kalesh Singh
am: 6bfa11ed64 Change-Id: I4b4f792c8f73d677df7af760dff4407327eb5a62
2019-06-06Merge "Add ashmemd_hidl_client to base_vendor.mk product packages."Treehugger Robot
2019-06-06Merge "Fix typo causing ALL_DEPS.$(module).ALL_DEPS to be incomplete."Martin Stjernholm
am: ddd8b1e64f Change-Id: If0050394af429eda5a75d34a3973a7254a8322c2
2019-06-06Merge "Fix typo causing ALL_DEPS.$(module).ALL_DEPS to be incomplete."Martin Stjernholm
2019-06-05Merge "Rebuild recovery-from-boot patch when calling add_img_to_target_files."Tao Bao
am: e55c0ae469 Change-Id: Ia2eb38f19deb6d57168707674ff70cffcc5d1032
2019-06-06Merge "Rebuild recovery-from-boot patch when calling add_img_to_target_files."Tao Bao
2019-06-05Renames system to framework and other to vendor.Daniel Norman
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-05DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into ↵Xin Li
stage-aosp-master Bug: 134605042 Change-Id: I95693ec9247275dbfb6eb8874dbaaf887ea989d7
2019-06-05Fix typo causing ALL_DEPS.$(module).ALL_DEPS to be incomplete.Martin Stjernholm
Test: m droid, look at some ALL_DEPS values using $(info). Change-Id: Ifc182a0545715343a677cb880e21062ce37f5e62
2019-06-05Merge "Revert "Revert "Revert "Print full diagnostics file when Java process ↵Jimmy Chen
crashes."""" am: 1e5fcc0d79 Change-Id: Id217a4a48f84af06390173507ea6ab96feed68c2
2019-06-05Merge "Revert "Revert "Revert "Print full diagnostics file when Java process ↵Treehugger Robot
crashes.""""
2019-06-05Revert "Revert "Revert "Print full diagnostics file when Java process ↵Jimmy Chen
crashes.""" This reverts commit 1e3ad0eb5df843f88d8e08c3766b5f620b569c93. Reason for revert: break build Change-Id: I43022f556d5b73956d44cdda43b0b2499225b123
2019-06-05Add misc_info.txt to rebuild super.imgIsaac Chen
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-04Rebuild recovery-from-boot patch when calling add_img_to_target_files.Tao Bao
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-05Make change and version bump to PPRL.190605.003android-build-team Robot
Change-Id: Ie8e1e74297d976017e2770ac08be67179a97ebd5
2019-06-04Merge "Changes.md: Change OUT_DIR to PRODUCT_OUT"Yasuhiro Kubota
am: ec2772d2be Change-Id: Id8ea12b491cea23a05eaab07afd525351258183d
2019-06-04Merge "releasetools: Allow verifying chained vbmeta partitions."Tao Bao
am: 23def8793d Change-Id: Iefbf9a8a8808db8f005652f55b5ecbe043acdcfe
2019-06-04Add ashmemd_hidl_client to base_vendor.mk product packages.Kalesh Singh
Change-Id: I77605e7129d4ffa6026f3546adbda61e59f50de0 Bug: 134161662 Test: m -j
2019-06-04Merge "Changes.md: Change OUT_DIR to PRODUCT_OUT"Treehugger Robot
2019-06-04Merge "releasetools: Allow verifying chained vbmeta partitions."Tao Bao
2019-06-04releasetools: Allow verifying chained vbmeta partitions.Tao Bao
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 814b14b3f79da4062335413b79284864b185a4b9)
2019-06-04Merge "Revert "Revert "Print full diagnostics file when Java process crashes."""Alexander Smundak
am: a9266be96f Change-Id: I5f4aeec1f31fb11a0ef76ebef9fb7889c03b9b6b
2019-06-04Merge "Revert "Revert "Print full diagnostics file when Java process crashes."""Treehugger Robot
2019-06-04Changes.md: Change OUT_DIR to PRODUCT_OUTYasuhiro Kubota
"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-03Merge "Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS""Tri Vo
am: f4a8b6415f Change-Id: I942327f1d4ac1c533d9732f2a4daa47e51975529
2019-06-03Merge "Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS""Tri Vo
2019-06-03Merge "core/main: Strip bitness before existence check"Anton Hansson
am: 9c560f17a8 Change-Id: Ic07705ece5884935ec6f6241d3f203e958e3c2c9
2019-06-03Merge "core/main: Strip bitness before existence check"Anton Hansson
2019-06-03Revert "Revert "Print full diagnostics file when Java process crashes.""Alexander Smundak
This reverts commit 6c77a6baa6461be855eb58814a223995eaa3dd66. Reason for revert: aog/974065 fixes the problem that caused the revert Change-Id: I935f78762b23ac63a79a9529515ff4ef394d5c3c
2019-06-03Merge "Adds validation check that certain partitions come from a single build."Daniel Norman
am: 206ef1f4fb Change-Id: I1ef19970c1944ad6257b3fd1c3dba6ee8488a437
2019-06-03Merge "Adds validation check that certain partitions come from a single build."Treehugger Robot
2019-06-03core/main: Strip bitness before existence checkFelix
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-02Merge "Fix dump-vars output to handle quotes."Alexander Smundak
am: 1270511080 Change-Id: I42c07d48964da1c61648b36498632d73c42f96ec
2019-06-02Merge "Fix dump-vars output to handle quotes."Alexander Smundak
2019-06-01Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"Tri Vo
Bug: 133196056 Test: m selinux_policy Change-Id: I194167cc33ed9b0367dd3edfd5d954af5c1b4a13
2019-06-01Adds validation check that certain partitions come from a single build.Daniel Norman
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