Commit Graph

21590 Commits

Author SHA1 Message Date
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
Alexander Smundak
f932b8ba9d Merge "Fix dump-vars output to handle quotes." am: 1270511080
am: 596bad5433

Change-Id: I2d5efad82557b6c8ff7b2afb12351d12ac353b95
2019-06-02 16:07:30 -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
android-build-team Robot
6e387b85ed Make change and version bump to QP1A.190602.001
Change-Id: Iafeabd47b4a5426e0f1f1a0441bed9e255d61683
2019-06-01 23:21:26 +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
287a102868 Version bump to QP1A.190530.004 [core/build_id.mk]
Change-Id: I9aa6eaab86146653620a5d349755f357fceb2ee9
2019-05-31 18:39:46 +00: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
503393e4bd Merge "Revert "Print full diagnostics file when Java process crashes."" am: 3134681218
am: f9f97fbd2d

Change-Id: Ibb1be55535aec2568c7b59867b60160794353e82
2019-05-31 02:56: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
android-build-team Robot
997eb1fc76 Version bump to QP1A.190530.003 [core/build_id.mk]
Change-Id: Iff6c5a9e247e9710bcc3c3f2f77479533fcc4383
2019-05-31 02:50:46 +00:00
patricktu
4e911c6f93 Merge "AIDEGen: Add the java sources of host java library modules into module-info.json." am: a628af2a42
am: f50f92ca7d

Change-Id: I0cfa635fadf032555739056d5e16d1c07519a81d
2019-05-30 18:18: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
Jooyung Han
36c1f678a3 fix: wrong dependency from ETC to libc++.so
There are prebuilt modules which are meant to be just copied.
e.g. ETC,SCRIPT,DATA files

The problem for current prebuilt_internal.mk is that those modules are
handled by cc_prebuilt_internal.mk, which adds libc++ as dependency,
which is simply wrong with copy-only prebuilt modules.

As a fix, misc_prebuilt_internal.mk is introduced to handle
ETC,SCRIPT,DATA prebuilt modules and doesn't do additional processing.

Bug: 132925121
Test: m nothing && check build-<TARGET>.ninja if there is no dependency
to libc++ from ETC modules such as /system/etc/sepolicy_test

Change-Id: I846f8e1f3741ca71c86f5420cfaafa7419ebf3f6
2019-05-31 07:24:42 +09:00
Sasha Smundak
77a32f630c Merge "Print full diagnostics file when Java process crashes." am: 81feca7af2
am: 2d8f0f846c

Change-Id: If5d052140a395805f0217dc6c7c26df7a55d959b
2019-05-30 14:43:06 -07:00
Treehugger Robot
81feca7af2 Merge "Print full diagnostics file when Java process crashes." 2019-05-30 21:16:51 +00:00
Alan Viverette
bf4790e6f9 Remove obsolete Support Library guidance from version_defaults.mk
am: c45849fc0c

Change-Id: I6321da70044130246288b7b7268b203f3a341a75
2019-05-30 13:26:29 -07:00
Treehugger Robot
8446ef89bd Merge "Remove obsolete Support Library guidance from version_defaults.mk" 2019-05-30 20:09:33 +00:00
android-build-team Robot
5a6501cdb2 Version bump to QP1A.190530.002 [core/build_id.mk]
Change-Id: I2c772dbfc79c48837bbb24abd582b5a0f6ccd8ac
2019-05-30 20:03:09 +00:00
Tao Bao
0fa45c308b Merge "Obsolete PRODUCT_STATIC_BOOT_CONTROL_HAL." am: f4d18a0d11
am: 91dda1066d

Change-Id: Ib5e242a2721a3d4b89f9065e3d5daf4bc0ab47e1
2019-05-30 10:17:09 -07:00
Alan Viverette
c45849fc0c Remove obsolete Support Library guidance from version_defaults.mk
Test: n/a docs only
Fixes: 133228727
Change-Id: I10cdd9a4dfe8c508417f7b80320e308c236f2c8e
2019-05-30 16:57:25 +00: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
android-build-team Robot
711d58a3df Make change and version bump to QP1A.190530.001
Change-Id: Ia5716c6eb80c15e2fbf8f7366690af21226021b4
2019-05-30 03:18:47 +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
android-build-team Robot
525ac92ea6 Version bump to QP1A.190529.003 [core/build_id.mk]
Change-Id: Ie03275169a2f525f932c89f4350a46366ad2179b
2019-05-29 21:32:53 +00:00
android-build-team Robot
901cf49ade Version bump to QP1A.190529.002 [core/build_id.mk]
Change-Id: I3bcdbce0111e659b2132639f9efb46dbb2a38dfc
2019-05-29 20:46:47 +00:00
Jaewoong Jung
d406f4af6e Merge "Deprecate inherit-package." am: cd56c0df95
am: aec3dad7f4

Change-Id: I5581d543f1cbc2c9ded7f9a6b5a5b3d4f92efa76
2019-05-29 13:25:01 -07:00