Commit Graph

21519 Commits

Author SHA1 Message Date
Dan Willemsen
3b37c4cad4 Merge "Add missing dependencies to python scripts" am: 56bfae6402
am: 083777a4c9

Change-Id: I791359b0acebb29402c8ebb922c0a3b30717889c
2019-06-10 20:37:40 -07:00
Treehugger Robot
56bfae6402 Merge "Add missing dependencies to python scripts" 2019-06-11 03:15:54 +00:00
android-build-team Robot
64f473826d Make change and version bump to QP1A.190611.001
Change-Id: I9ffe8ad056942aa04314d5bee2a94df3650cac7f
2019-06-11 03:15:25 +00:00
Dan Willemsen
fa9252d3f7 Merge "Convert java proto generation to use srcjars" am: 68c39b5d06
am: a5ce550534

Change-Id: I95e036ffd49c20914b6aeedb5f2e5f58b482557e
2019-06-10 20:06:34 -07:00
Treehugger Robot
68c39b5d06 Merge "Convert java proto generation to use srcjars" 2019-06-11 02:51:18 +00:00
Jooyung Han
7921c73255 Merge "Ignore testcases' NOTICE files" am: e6d5b8321f
am: 415074c997

Change-Id: I2af85be677cad04196776756f5528de9c8c59b70
2019-06-10 18:00:54 -07:00
Jooyung Han
3a1f5a85bc Merge "fix: wrong dependency from ETC to libc++.so" am: 86a3f0c6c0
am: f21e15515d

Change-Id: I1ae4d0ecb00f766a733863f36a64cc8a8f5d5db4
2019-06-10 18:00:08 -07: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
Oliver Nguyen
e91ab2397f Package coverage files as a zip.
Test: make NATIVE_COVERAGE=true COVERAGE_PATHS="*"
Change-Id: I7ee9253ef47a502a9d29f7e15a4402cbb90e34ae
2019-06-10 15:27:31 -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
Hridya Valsaraju
0606ded214 Merge "Print a warning when sum of sizes of logical partitions an OEM-set limit" am: f1e61651e0
am: 9f72c850d7

Change-Id: I7ff45a5a34be2fa85c73f050cac698dc3169c125
2019-06-10 11:33:04 -07:00
Hridya Valsaraju
9f72c850d7 Merge "Print a warning when sum of sizes of logical partitions an OEM-set limit"
am: f1e61651e0

Change-Id: Id8ec086da905b4c350b556cbb0633854e0e34017
2019-06-10 11:28:06 -07: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
android-build-team Robot
544e95e83f Make change and version bump to QP1A.190610.001
Change-Id: Ie8dd4efd89943b10a53fd8918db8b2a4cfd46586
2019-06-09 23:16:29 +00:00
android-build-team Robot
b520db13f9 Make change and version bump to QP1A.190609.001
Change-Id: I912be523c90599636dbbbad2117a8e2762adb524
2019-06-08 23:16:24 +00: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
android-build-team Robot
c609f1ebb7 Version bump to QP1A.190606.002 [core/build_id.mk]
Change-Id: I95b0758241cc0f8b5ef09b8d2aaeabc1803fb553
2019-06-07 01:59:05 +00:00
Alistair Strachan
126c86e559 Merge "Add misc_info.txt to rebuild super.img" am: 95836d71e6
am: c0e3153e3f

Change-Id: I095512c218d962fa0d10ec5e59a4c58071ee7564
2019-06-06 13:42:39 -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
Martin Stjernholm
bc345d9cad Merge "Fix typo causing ALL_DEPS.$(module).ALL_DEPS to be incomplete." am: ddd8b1e64f
am: 54b9c7e4cf

Change-Id: Ic8a695b6ebaf9a656f96738c8d2bc5d031c36621
2019-06-06 02:53:46 -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
android-build-team Robot
d1447629d9 Make change and version bump to QP1A.190606.001
Change-Id: Icac4a2d2978fc5941c4c5e0c4874ea59d635be1a
2019-06-06 06:52:04 +00:00
Tao Bao
97a6690a23 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
Merged-In: I5859e30be63bfd54398cf41fd2d907f15285f560
(cherry picked from commit 4978fa99d1)
2019-06-05 22:04:47 -07:00
Tao Bao
41376712ca Merge "Rebuild recovery-from-boot patch when calling add_img_to_target_files." am: e55c0ae469
am: d4680b2f33

Change-Id: Ifa54144ab48d54b7b2b18425f2951f249b625274
2019-06-05 21:19:26 -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
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
93e8d1761c Merge "Revert "Revert "Revert "Print full diagnostics file when Java process crashes."""" am: 1e5fcc0d79
am: 6a17707e57

Change-Id: I011d000144534d1fd35d8e3f0658e0d66d75ff7c
2019-06-05 03:17:12 -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
5f27d3c100 Make change and version bump to QP1A.190605.001
Change-Id: I6b7d95613f136840aafb9b1ef137734fa1af2e67
2019-06-05 03:17:19 +00: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
Alexander Smundak
1ff5e3c566 Merge "Revert "Revert "Print full diagnostics file when Java process crashes.""" am: a9266be96f
am: f6e6eb1dc1

Change-Id: Id7d9c06208793870f4db0de16f65e7f858ebc950
2019-06-04 17:51:25 -07:00
android-build-team Robot
cadeadf764 Version bump to QP1A.190604.002 [core/build_id.mk]
Change-Id: Ifff361e7dc5e4ebe05e2bcd7849a1ba168371085
2019-06-04 19:13:36 +00:00
Treehugger Robot
a9266be96f Merge "Revert "Revert "Print full diagnostics file when Java process crashes.""" 2019-06-04 17:16:10 +00:00
android-build-team Robot
f0d815f176 Make change and version bump to QP1A.190604.001
Change-Id: Ic4ed77870364b2f43082d25a88f1af81a0a741bd
2019-06-04 03:17:06 +00:00
Tri Vo
afa741aaca Merge "Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"" am: f4a8b6415f
am: f61d6b97dd

Change-Id: Ic6f3a7196f8b3e5b6801e63142f8bacaf99a4d52
2019-06-03 13:36:55 -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
b614f4ea2b Merge "core/main: Strip bitness before existence check" am: 9c560f17a8
am: bbef3c75a5

Change-Id: If61776d8e113d694995aa6aae168e7ecc870084c
2019-06-03 12:13:30 -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
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
android-build-team Robot
8a8881fac8 Make change and version bump to QP1A.190603.001
Change-Id: I671ec9a0eae1be75b6755219c1d57f1da99e60c6
2019-06-02 23:16:32 +00:00