Commit Graph

50515 Commits

Author SHA1 Message Date
Dan Willemsen f14179b3ff Fix some java library dependencies
Bug: 130111713
Test: treehugger
Test: build system image w/RBE
Change-Id: I2c76701c1ad396c1b13f873297785c736fba544d
2019-06-12 21:36:29 +00:00
Dan Willemsen b441630067 Depend on NDK libraries
Bug: 130111713
Test: treehugger
Test: build system image with RBE
Change-Id: Ibbe4e11a7681c52d2197ce35ae47d4939ca246b6
2019-06-12 21:35:46 +00:00
Dan Willemsen bbe4e11a76 Call clean-path in more places
When an Android.mk specifies a local path that is outside the current
directory, it uses '..', since we prepend $(LOCAL_PATH)/ to the given
path.

This path ('a/b/../c') gets inserted into command lines and
dependencies. For dependencies, when it gets to Ninja, Ninja calls
CanonicalizePath and removes those references ('a/c'), but the command
line is preserved.

So we've got a command line that references 'a/b', but no dependency on
it. Usually that's not a big problem, but it's an issue if we're trying
to only expose dependencies to the rule, like with RBE only sending the
dependencies to the remote workers. So use our 'clean-path' macro to
collapse the '..' references in Kati so that they don't show up in the
command line either.

Test: treehugger
Test: build a system image with RBE
Change-Id: I0706faa2ac15e9c12c720f43c7bb8171c5efd97c
2019-06-12 21:35:33 +00:00
Dan Willemsen 0706faa2ac Add missing dependecy on SOONG_ZIP
Bug: 130111713
Test: treehugger
Change-Id: Ic5b7c4fbefa83cf002c5f30c1b4646f35e718ca2
2019-06-12 21:35:24 +00:00
Dan Willemsen c5b7c4fbef Add dependencies on the toolchain (clang, etc)
Historically, we've relied on the path to the clang compiler changing in
order to trigger rebuilds instead of direct dependencies on the compiler
itself. That's somewhat more reliable, since the actual $(CLANG) file is
often a script that doesn't actually change during every update.

In Soong, we've added the dependency anyway, so do it here as well. This
makes it easier for my RBE experiments to identify when we intend to use
clang and to send the entire compiler.

Test: treehugger
Test: build a system image with RBE, find that every command that needed
the compiler gets it.
Change-Id: I3838b5d77884394a8c0f7a1ba133142102602084
2019-06-12 21:34:52 +00:00
Tao Bao 4995d2fe16 Merge "releasetools: No-op change to use common.AVB_VBMETA_PARTITIONS." 2019-06-11 15:03:12 +00:00
Treehugger Robot 56bfae6402 Merge "Add missing dependencies to python scripts" 2019-06-11 03:15:54 +00:00
Treehugger Robot 68c39b5d06 Merge "Convert java proto generation to use srcjars" 2019-06-11 02:51:18 +00:00
Treehugger Robot e6d5b8321f Merge "Ignore testcases' NOTICE files" 2019-06-11 00:24:31 +00:00
Treehugger Robot 86a3f0c6c0 Merge "fix: wrong dependency from ETC to libc++.so" 2019-06-11 00:24:13 +00:00
Dan Willemsen c84e4cb917 Add missing dependencies to python scripts
These were found when trying to run remotely on RBE with only the
sources depended upon available for each rule.

Bug: 130111713
Test: treehugger
Change-Id: Id763f8fc7dfbe60445f98604db3422147165f537
2019-06-10 23:58:49 +00:00
Dan Willemsen 84c6c1cfe4 Convert java proto generation to use srcjars
So that we actually represent all files in the build graph.

Test: treehugger
Change-Id: I48e32437fcfd8c0de8cbc87d07934393db557aa4
2019-06-10 16:31:07 -07:00
Tao Bao cd951b2bdb releasetools: No-op change to use common.AVB_VBMETA_PARTITIONS.
common.AVB_VBMETA_PARTITIONS was recently added (commit
08c190fc89) for the same purpose.

Test: TreeHugger
Change-Id: I65572d54c22a753fdef80677377fcc9b684ee16f
2019-06-10 15:29:19 -07:00
Xin Li 236438ab1e Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 2019-06-10 19:54:59 +00:00
Treehugger Robot f1e61651e0 Merge "Print a warning when sum of sizes of logical partitions an OEM-set limit" 2019-06-10 18:17:40 +00:00
The Android Open Source Project a0a79692b1 DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
Bug: 134605042
Change-Id: I4ade3d1851fe90a24f81cfdbc8a7f0c8e747830c
2019-06-10 09:32:23 -07:00
Neil Fuller 106a3210d8 Merge "Add a host simulation of the tzdata module"
am: 69324709f8

Change-Id: Idc4ccd533fcfb12ad6161855fde7a149f5c030e8
2019-06-10 04:03:00 -07:00
Neil Fuller 69324709f8 Merge "Add a host simulation of the tzdata module" 2019-06-10 10:51:09 +00:00
Neil Fuller 66baeb523d Add a host simulation of the tzdata module
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-10 10:50:51 +00:00
Anton Hansson d0d4f1b156 Merge "Make mainline device use apex"
am: b3cb9284e8

Change-Id: I4cb3d588b6fab12364fba0a4a8cba224ce91c50d
2019-06-10 03:26:35 -07:00
Treehugger Robot b3cb9284e8 Merge "Make mainline device use apex" 2019-06-10 10:20:16 +00:00
Anton Hansson 7d679bb26a Make mainline device use apex
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-10 10:17:27 +01:00
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
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
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