Commit graph

68822 commits

Author SHA1 Message Date
Sasha Smundak
c106138baf Implement add_soong_namespace and add_soong_config_var_value functions
Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: I129136e83d2d00ef5b64d3aab07b98719198dcfe
2021-07-29 11:24:35 -07:00
Sasha Smundak
0e4a5ad24b Trim spaces in the rule actions
When rule action contains something like
  cp $(FOO) ...
and FOO is set with
FOO := a \
 b \

the generated Ninja file constains extra spaces, making it
difficult to compare it to the same file generated by the
Starlark-based product configuration.

Bug: 181797530
Test: manual
Change-Id: I278bd8edf0f017a31c5b5115b2a38f4f663c55fc
2021-07-29 10:57:06 -07:00
Sasha Smundak
31b6b9442a Add copy-files macro
To allow refactoring a lot of product configuration makefiles.

Bug: 190051051
Test: treehugger
Change-Id: I1d22ed6f3df17fb616bd272c0d928aa1fdb9729a
2021-07-29 10:57:06 -07:00
satayev
72602c4687 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." 2021-07-29 11:23:43 +00:00
Kelvin Zhang
8ee181df52 Merge "Fix a bug in computing streaming property of payload.bin" 2021-07-28 21:51:49 +00:00
Kelvin Zhang
25ab998d82 Fix a bug in computing streaming property of payload.bin
When computing the data offset of an entry in zip file, we used length
of extra field from central directory. That is correct most of the time
but wrong if the extra field in central directory has different length
than the one in local file directory. Since python's zipfile doesn't
provide an API to access local file header, we need to parse local file
header ourselves and extract length of extra field.

An incorrect offset will cause magic mismatch error from update_engine,
as update_engine expects to find uncompressed payload at the recorded
offset.

Test: th, partner verification
Bug: 191443484

Change-Id: Id670cd79b0bd65adffaaa5224ae4f8065d66b358
2021-07-28 11:40:18 -04:00
satayev
ed0817932b Rename UpdatableSystemServerJars to ApexSystemServerJars.
This is consistent with naming for boot jars, e.g. ApexBootJars.

Bug: 191127295
Test: presubmit
Change-Id: I1d4378e0d2dc73af2ffd8c4cc66ab8c0e2981d2f
2021-07-28 14:03:57 +01:00
Roland Levillain
7b763f0d46 Merge "Add extra owners for file core/tasks/art-host-tests.mk." 2021-07-28 12:51:01 +00:00
satayev
96fa127572 Merge "Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS." 2021-07-28 10:36:39 +00:00
Roland Levillain
add7902aab Merge "Work around art-host-tests build issues when using ART prebuilts." 2021-07-28 09:29:49 +00:00
Roland Levillain
6db8228316 Add extra owners for file core/tasks/art-host-tests.mk.
Test: build/make/tools/checkowners.py -c build/make/core/tasks/OWNERS
Bug: 169111770
Change-Id: I6dbbabd35386d806a786e1d895070bb2c19fa2c6
2021-07-28 10:21:56 +01:00
Jooyung Han
6c4e8d5f97 Merge "cleanup: remove unnecessary steps in apex_utils" 2021-07-28 00:56:41 +00:00
satayev
a85d5225ee Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS.
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
2021-07-27 16:09:52 +00:00
Roland Levillain
4d9d0aa86c Work around art-host-tests build issues when using ART prebuilts.
Using prebuilts of the ART Module seems to make
`COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES` empty on
x86 targets, thus breaking the `art-host-tests` build target. As
a workaround, relax the corresponding build rule to allow for an
empty `COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES`
list.

Test: lunch cf_x86_phone-userdebug
        && SOONG_CONFIG_art_module_source_build=false m art-host-tests
Bug: 194627489
Change-Id: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
2021-07-27 15:00:48 +01:00
Kelvin Zhang
7fd6933e90 Merge "Skip vbmeta_system if it doesn't exist" 2021-07-27 13:18:49 +00:00
Kelvin Zhang
a19fb315e0 Skip vbmeta_system if it doesn't exist
Test: validate_target_files bonito-target_files-7582772.zip
Change-Id: I2da4f5a7897b1ef155e17441a8f5b97c0716d601
2021-07-27 09:17:05 -04:00
Devarshi Bhatt
829778c435 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=162536543

Change-Id: I898ab6d972e3dd3dce64cf5fdbb4a2698c2c29e3
2021-07-27 13:16:10 +00:00
Jiyong Park
f253430313 Merge changes from topic "remove_ndk_platform"
* changes:
  Fix build
  Reland: *-ndk.so libraries are added to the VNDK set.
2021-07-27 01:01:58 +00:00
satayev
2bcf499b56 Merge "Rename UpdatableBootJars to ApexBootJars." 2021-07-26 17:59:36 +00:00
Colin Cross
443105f6d1 Rename T to Tiramisu
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Change-Id: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
(cherry picked from commit a45d0c890e)
2021-07-26 09:42:50 -07:00
Colin Cross
47d36a96ad Fix build
Test: m out/target/product/bramble/obj/PACKAGING/vndk_intermediates/check-list-timestamp
Merged-In: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
Change-Id: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
(cherry picked from commit 980089dab4)
(cherry picked from commit ee3ddc7159)
2021-07-26 11:25:24 +09:00
Jiyong Park
d502a48dc4 Reland: *-ndk.so libraries are added to the VNDK set.
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m
Merged-In: I4c45fdfd64159370813c40c8fa5554744b630746
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
(cherry picked from commit ebe0e06055)
2021-07-26 11:25:04 +09:00
Kelvin Zhang
76e3fb0597 Merge "Add an option for VABC xor" 2021-07-24 00:25:03 +00:00
Kalesh Singh
d29f7d5466 Merge "vndk-list: Add android.system.suspend-V1-ndk_platform.so" 2021-07-23 17:16:28 +00:00
Colin Cross
046531066c Merge "Remove Fuchsia support from Make" 2021-07-23 17:15:45 +00:00
Jose "Pepe" Galmes
81005b13f7 Merge "Support for dexopt postprocessing in merge_target_files." 2021-07-23 04:42:43 +00:00
Treehugger Robot
94bd6d7d5b Merge "Sets BOOT_SECURITY_PATCH for the generic boot.img" 2021-07-23 01:41:31 +00:00
Tianjie Xu
58d0484e97 Merge "Amend owner files for releasetool scripts" 2021-07-22 21:37:04 +00:00
Jose Galmes
9c8f6eb7e1 Support for dexopt postprocessing in merge_target_files.
When using the VSDK, dexopt is not applied during the vendor build.
To avoid a first-boot time regression, dexopt is applied during the
merge stage, by running dexopt on the vendor apps and rebuilding
the vendor image.

Bug: 188179859
Test: Tested in keystone with VSDK target
Change-Id: Ie8e2d0a82850a2901fa6f250433bcbb43f0a97f2
2021-07-22 13:39:10 -07:00
Jooyung Han
f9be5eeb44 cleanup: remove unnecessary steps in apex_utils
`zipalign` before `signapk -a 4096` is unnecessary step since `signapk
-a 4096` does the same thing.

And, compressed APEX files don't need entries to be aligned.

Bug: 193362313
Test: atest --host releasetools_test
Change-Id: I0758d1162f7c3eb8cc9c73978b5ae5484f007a3a
2021-07-22 18:37:02 +09:00
Bowgo Tsai
81a23fed56 Sets BOOT_SECURITY_PATCH for the generic boot.img
This is for GKI 1.0 devices to pass VtsHalKeymasterV4_0TargetTest.

For GKI 2.0 devices, they will use device-specific
BOOT_SECURITY_PATCH to sign a prebuilt GKI boot.img to
override this value.
See https://r.android.com//1711437 for details.

Bug: 192513934
Test: `lunch gsi_arm64-user` then `make bootimage`
Test: `avbtool info_image --image $OUT/boot-4.19-gz.img`, checks
      com.android.build.boot.security_patch exists
Change-Id: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
2021-07-22 16:09:05 +08:00
Tianjie
35ec7561d0 Amend owner files for releasetool scripts
Test: th
Change-Id: Ia77586f634609e5f3a8868e7d1237776052aab30
2021-07-21 16:10:53 -07:00
satayev
97aea02065 Merge "Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS." 2021-07-21 17:48:10 +00:00
satayev
8bc189e39f Rename UpdatableBootJars to ApexBootJars.
Note that ART apex boot jars and core-icu4j are exceptions here as they
are not part of ApexBootJars. ART apex boot jars are defined in their
own variable, while core-icu4j is treated as a regular non-updatable
boot jar.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I5f5feb7344941d0154f384e3c06279d49b490768
2021-07-21 14:14:44 +01:00
Treehugger Robot
da7ca70cd0 Merge "signapk: --align-file-size flag" 2021-07-21 00:23:08 +00:00
Jooyung Han
ebe9afeb4a signapk: --align-file-size flag
A new flag tells that the resulting file size should be aligned as well.

For example, signapk -a 4096 --align-file-size ... generates the output
file of 4K-aligned sized.

Bug: 192991318
Test: check built APEX file size.
  APEX files should be sized as 4K-aligned.
Change-Id: I1c287e7219b4551bbb3e5957bdb64d80adfd3c39
2021-07-21 00:19:07 +00:00
Kalesh Singh
43014449a5 vndk-list: Add android.system.suspend-V1-ndk_platform.so
Bug: 170260236
Test: m
Change-Id: Ibebad08a196504da32d733213226de78a30f0cd1
2021-07-20 23:31:05 +00:00
Colin Cross
12b809af0c Remove Fuchsia support from Make
Bug: 194215932
Test: m checkbuild
Change-Id: I0f6fe8629beb10020d36a347e9f9385dda3e2684
2021-07-20 13:17:47 -07:00
satayev
65e68bb263 Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS.
Regardless of an "updatable" property of individual, list all apex boot
jars in the same variable. This is less confusing for devs, especially
since they shouldn't care about things like boot images.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a
Merged-In: I0a559db462d1e1f67003ac54d1e27a89110d802a
2021-07-20 15:46:53 +01:00
Treehugger Robot
37e6196c4e Merge "Fix typo in MODULE_BUILD_FROM_SOURCE variable." 2021-07-20 11:30:08 +00:00
Yifan Hong
ecef6fa224 Merge changes from topic "ota-package-nonab"
* changes:
  Only build OTA package for non-A/B with recovery
  Reland "Build OTA when boot image exists even without kernel or recovery fstab"
2021-07-20 02:59:47 +00:00
Jooyung Han
28176b66ba Merge "zipalign: use getopt" 2021-07-19 22:53:21 +00:00
Daniel Norman
e62232d71a Merge "Adjust some behaviors for --rebuild-sepolicy" 2021-07-19 20:39:09 +00:00
Yifan Hong
f32f65c5a4 Only build OTA package for non-A/B with recovery
Change Id397ad097539 alone would break hikey build, which
is a non-A/B device with a boot image, but without recovery.

Do not build OTA in this case.

Test: lunch hikey && m dist
Fixes: 194018054
Bug: 193588301
Change-Id: I8d09ad5c62d44699eb910ff62d32044bd97e8e44
2021-07-19 10:38:25 -07:00
Yifan Hong
8c1e526fdd Reland "Build OTA when boot image exists even without kernel or recovery fstab"
This reverts commit bf77787cc9.

Reason for revert: relanding change

Test: see next CL
Bug: 193925883
Bug: 193588301

Change-Id: Id397ad0975390617bd277573f2cdba9a2677842d
2021-07-19 10:38:25 -07:00
Yifan Hong
fa26e5b8db Merge "Revert "Build OTA when boot image exists even without kernel or recovery fstab"" 2021-07-19 16:33:26 +00:00
Yifan Hong
bf77787cc9 Revert "Build OTA when boot image exists even without kernel or recovery fstab"
This reverts commit ff2e24d6f9.

Reason for revert: breaks build

Bug: 194018054
Change-Id: Ia7f0436d21dc07143f7fae6f90a73bb4f730e98d
2021-07-19 16:28:49 +00:00
Jooyung Han
b72009a8e9 zipalign: use getopt
Bug: 192991318
Test: zipalign_tests
Change-Id: I49f8ebc2cc2dbefe53c2eedda8d185eb658b4124
2021-07-17 07:19:09 +09:00
Treehugger Robot
bcb4776446 Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS." 2021-07-16 17:22:47 +00:00
Yifan Hong
d15c78090c Merge changes from topic "ota_for_generic_boot_image"
* changes:
  Also extract kernel configs from boot image.
  Build OTA when boot image exists even without kernel or recovery fstab
2021-07-16 16:52:10 +00:00