Commit Graph

67678 Commits

Author SHA1 Message Date
Tianjie Xu
efc00ca7b2 Merge "Calculate the vbmeta digest when building images" 2021-05-07 19:06:32 +00:00
Inseob Kim
6fa22ce3fa Merge "Add BOARD_USES_ODMIMAGE to soong config" 2021-05-06 23:59:18 +00:00
satayev
870137625e Merge "Sort PRODUCT_UPDATABLE_BOOT_JARS." 2021-05-06 12:53:10 +00:00
satayev
9eb1435745 Merge "Add 'platform:' prefix to unqualified system server jars." 2021-05-06 11:32:39 +00:00
Inseob Kim
c58ff2cde9 Add BOARD_USES_ODMIMAGE to soong config
Bug: 33691272
Test: m selinux_policy
Change-Id: I20a5b61d8ae830caa8792662a9e9886f3da05af8
2021-05-06 11:09:13 +00:00
Colin Cross
05302dade9 Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" 2021-05-06 03:16:20 +00:00
Colin Cross
7b70d98d1f Fix reference to uncleared variable in dex_preopt_odex_install.mk
dex_preopt_odex_install.mk referenced $(built_module), which is only
set by some prebuilt modules, leaving old values when building
non-prebuilt modules.  Use $(LOCAL_BUILT_MODULE) instead, which is set
for all modules by base_rules.mk.

Test: manual
Change-Id: Iecf092f9869d5edda3671d0999987906781d023e
2021-05-05 14:43:04 -07:00
Tianjie
bbde59f9eb Calculate the vbmeta digest when building images
Calculate the vbmeta digest if the device builds vbmeta image. The
digest will used later to determine the build fingerprint in new
format.

One sample usage is the ota package generation, where we put the
build fingerprint in the ota metadata. But we don't have the runtime
vbmeta digest provided the bootloader.

Bug: 186786987
Test: unit tests
Change-Id: If572e2b973e295a6c95a9e23a65bb20b3afbf1b0
2021-05-05 18:04:51 +00:00
satayev
c89e4a007a Sort PRODUCT_UPDATABLE_BOOT_JARS.
At runtime it is now responsibility of derive_classpath to define value
of BOOTCLASSPATH. As we are modularizing BCP configs, the end goal is to
have a following ordering:

- ART APEX jars
- /system jars
- /system_ext jars
- /apex jars from non-updatable apexes
- /apex jars from updatable apexes

Note that /apex configs are sorted alphabetically, however they preserve
relative ordering of the jars exported from individual apexes. For
example, core-oj.jar would come before bouncycastle.jar if ART apex
defines their relative order as such.

To match end goal expectations of the APEX ordering, sort existing list
of PRODUCT_UPDATABLE_BOOT_JARS.

Bug: 180105615
Test: presubmit
Change-Id: I15512c0da79ad94b547325d563dac473c006f9fd
Merged-In: I15512c0da79ad94b547325d563dac473c006f9fd
2021-05-05 15:40:08 +01:00
satayev
35a7a43b56 Add 'platform:' prefix to unqualified system server jars.
This allows Soong side changes to treat SystemServerJars as
android.ConfiguredJarList, same as boot jars.

Bug: 180105615, 155630745
Test: m && launch_cvd
Change-Id: I717d4351edcd82028ac19cb9265e18b98d11c661
2021-05-05 15:18:39 +01:00
Kelvin Zhang
e8d28faee6 Merge "Disable downgrade VABC OTAs" 2021-05-05 13:08:42 +00:00
Kelvin Zhang
2a3e5b1cf5 Disable downgrade VABC OTAs
Downgrade VABC OTA causes users to wait in recovery for merge to
complete, disable by default.

Test: th
Test: generate downgrade OTA, make sure VABC disabled
Test: generate upgrade OTA with --wipe_user_data, make sure VABC
disabled
Test: generate upgrade OTA, make sure VABC is used
Test: generate downgrade OTA with --vabc_downgrade, make sure VABC is
enabled
Bug: 187215486

Change-Id: Ib7e6165252d47f1ecaac4fc2329b580274c8d70e
2021-05-05 09:08:12 -04:00
Treehugger Robot
f1d8833075 Merge "Usee sha256 to build the hashtree in GSI image" 2021-05-05 10:08:32 +00:00
Bowgo Tsai
60074168da Usee sha256 to build the hashtree in GSI image
The default algorithm is sha1, which shouldn't be used now.
Becaues sha256 is more robust against malicious attacks.

Bug: 187021780
Test: TreeHugger
Change-Id: Ia325f59d09687d6d501d9710cbdd3339d7566c60
2021-05-05 12:27:09 +08:00
Treehugger Robot
664959831e Merge "Enforce debugfs restrictions on GSI builds too." 2021-05-04 16:58:40 +00:00
Treehugger Robot
bf7d6d78c7 Merge "Make verifymodinfo in envsetup.sh quiet on errors during tab completion" 2021-05-03 23:05:11 +00:00
Chih-hung Hsieh
73524b6bdd Merge "Fix more pylint warnings." 2021-05-03 17:37:58 +00:00
Hamzeh Zawawy
26e4d3ed11 Merge "Add new target for building rust fuzzers for haiku" 2021-05-03 16:42:59 +00:00
David Srbecky
d18e14229c Merge "Propagate CREATE_MINIDEBUGINFO to strip.sh" 2021-05-03 15:42:01 +00:00
Treehugger Robot
34949e63da Merge "Avoid to print undefined image_size and partition_size" 2021-05-01 03:45:13 +00:00
Chih-Hung Hsieh
a606822f35 Fix more pylint warnings.
* add .pylintrc to use 2 space indentation
* rename single-letter local variables

Test: ./warn.py build.log > warnings.html
Change-Id: I2ca56a6cb130a9d6c73328c5592ad7cde8a974ab
2021-04-30 14:32:25 -07:00
David Srbecky
bf086ed1a6 Propagate CREATE_MINIDEBUGINFO to strip.sh
Bug: 110133331
Test: m
Change-Id: I5899ad1c0f6111a48eabe7a104a573787cc688e7
2021-04-30 21:41:19 +01:00
Treehugger Robot
10b66f6975 Merge "Use python3 specifically for envsetup.sh" 2021-04-30 19:14:55 +00:00
Treehugger Robot
d19ec52207 Merge "Disable VABC if either source/target doesn't support it" 2021-04-30 18:10:49 +00:00
Colin Cross
b847012f3b Merge "Use order-only dependencies for symbols files" 2021-04-30 14:42:46 +00:00
Kelvin Zhang
563750f483 Disable VABC if either source/target doesn't support it
If source supports VABC, delta_generator/update_engine will attempt to
use VABC. This dangerous, as the target build won't have snapuserd to
serve I/O request when device boots. Therefore, disable VABC if source
build doesn't supports it.

Test: downgrade from VABC enabled build to a build w/o VABC

Change-Id: Ie8353e00f65354c2242ee5255b6652c6b62483a4
2021-04-30 10:06:26 -04:00
Chih-hung Hsieh
6ddd85608f Merge "Fix/suppress most pylint and gpylint warnings" 2021-04-30 00:31:15 +00:00
Joe Onorato
0bac4fe09d Make verifymodinfo in envsetup.sh quiet on errors during tab completion
Test: m <tab><tab> before having done a full build.
Test: m <tab><tab> after having done a full build.
Change-Id: I35154151e6902d0337a26eab27d9d4fc797beed7
2021-04-29 15:44:29 -07:00
Joe Onorato
4acbe3b416 Use python3 specifically for envsetup.sh
Test: . build/envsetup.sh ; m <tab>
Change-Id: I94152c567f179fd7829bc675766e764624e5b7a3
2021-04-29 15:44:29 -07:00
hamzeh
5dfe7a214b Add new target for building rust fuzzers for haiku
Test: make haiku-rust
Change-Id: I0badb5c0ae4138abdbd3f9a404e8883f70ceb503
2021-04-29 13:28:04 -07:00
Treehugger Robot
d9d007b271 Merge "Move core-icu4j.jar down in PRODUCT_BOOT_JARS." 2021-04-29 08:59:50 +00:00
Huang Jianan
f63abb1cae Avoid to print undefined image_size and partition_size
If dynamic partitioning is enabled and the partition size is not set,
we will get a KeyError before image_size or partition_size is calculated
when we try to catch exception in BuildImageMkfs.

Bug: 186704243
Test: build_image.py can correctly throw exception
Change-Id: I3d8c143ad5603d07fe94afb8bb911ead244f0bf7
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
2021-04-29 07:40:46 +00:00
Chih-Hung Hsieh
98b285dafb Fix/suppress most pylint and gpylint warnings
* Add missing function doc strings.
  Suppress this warning on trivial functions in *_warn_patterns.py.
* Remove unused g-importing-memeber, g-complex-comprehension.
* Suppress pylint warning on unrecognized g-* options.
* Suppress too-few-public-methods warnings on simple classes.
* Suppress too-many-arguments and missing-function-docstring in
  html_writer.py, which will be refactored later.
* Fix bad naming, long lines and line breaks, and bad quotes.

Test: compare output for build.log
Change-Id: Icdb34f014a10ec1e642c2cfe8003fc3ae245b507
2021-04-28 14:57:56 -07:00
Christian Wailes
a6d2d8c79a Merge "Update init.rc prebuilt handling" 2021-04-28 16:41:09 +00:00
Treehugger Robot
2c806a7c94 Merge "Moving debug ramdisk resources under / of the ramdisk" 2021-04-28 16:27:34 +00:00
satayev
188082ae34 Move core-icu4j.jar down in PRODUCT_BOOT_JARS.
For go/updatable-bootclasspath it would simplify the logic if all
system boot jars were in a single block, instead of having some apex
jars in between them.

core-icu4j.jar used to be part of ART_APEX_JARS before it moved to its
own apex. However, this change puts it after system jars in relative
ordering.

Bug: 180105615
Test: presubmit
Change-Id: Icadc1b67191172bb02d1a15bdfa3d2e6f69227aa
2021-04-28 16:58:02 +01:00
Colin Cross
db98001be1 Use order-only dependencies for symbols files
Use an order-only dependency from $(LOCAL_BUILT_MODULE) to the symbols
file so that wiping the symbols directory during installclean doesn't
force anything to rebuild.

Bug: 186507256
Test: m && rm -rf $OUT/symbols && m
Change-Id: Ic164819c71f9db6126ff91c58752c8727cde0d5e
2021-04-27 19:43:33 -07:00
Nikita Ioffe
63c81449b7 Merge "Revert "Re-land "Enable apex compression on all devices with updatable apex"" 2021-04-27 17:02:58 +00:00
Nikita Ioffe
b695e761f1 Revert "Re-land "Enable apex compression on all devices with updatable apex"
This reverts commit 3df934b8a8.

Reason for revert: Might break weekly DF: b/185708645#comment11

Bug: 185708645
Change-Id: Ia5526e7895d27d230b1394eee666d5b3d73a08f0
2021-04-27 14:49:20 +00:00
Hridya Valsaraju
b566a9e2e4 Enforce debugfs restrictions on GSI builds too.
Debugfs build-time/run-time restrictions must be enabled on GSI builds
as well.

Test: Build, boot
Bug: 184381659
Change-Id: I940b0a2f6e22086dd479004a68bf6ad1cfe9eb13
2021-04-26 22:19:27 -07:00
Chih-hung Hsieh
cf8814cdb9 Merge "Use python3" 2021-04-27 05:11:01 +00:00
Chih-Hung Hsieh
7cc0e15e4a Use python3
Test: warn.py build.log > warnings.html
Change-Id: I781ea7bfe023ec5af829757c417bc70aba80af0d
2021-04-26 17:09:36 -07:00
Treehugger Robot
5e5b52033c Merge "Copy dexpreopt.config only if it exists" 2021-04-26 16:49:16 +00:00
Treehugger Robot
243f9ea65f Merge "sign_target_files_apks: Relax ro.build.description requirements" 2021-04-24 05:13:01 +00:00
Treehugger Robot
87cfdce392 Merge "Revert "Enable support for verity writes for VABC targets"" 2021-04-24 03:36:26 +00:00
Treehugger Robot
c02be15729 Merge "Simplify codes for BuildSuperImage func" 2021-04-24 02:20:35 +00:00
Bowgo Tsai
610286a88f Moving debug ramdisk resources under / of the ramdisk
Currently the debug ramdisk resources might be under / or
/first_stage_ramdisk of the ramdisk, and is determined by
some BOARD variables, e.g., BOARD_USES_RECOVERY_AS_BOOT,
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT, etc.

To make a generic boot-debug.img that can work on both devices,
let's move the debug resources always under / of the ramdisk.

Bug: 186082603
Test: boot a device with boot-debug.img
Test: boot a device with vendor_boot-debug.img
Change-Id: I55dc8ff322f6b97e2d6dc1a4ee5935e863f2f835
2021-04-24 08:55:02 +08:00
Kelvin Zhang
c777570825 Revert "Enable support for verity writes for VABC targets"
This reverts commit 6bb647fb85.

Reason for revert: b/186213024

Change-Id: I35054cf263c9118933fb885d5740546af3d4deec
2021-04-23 22:44:01 +00:00
jiajia tang
92b6078314 Simplify codes for BuildSuperImage func
Use common function LoadDictionaryFromFile(), instead
of LoadDictionaryFromLines(). Makes these codes conciser.

Change-Id: Ibb6f19744246b3415bcd639bc59dbb2aede725d9
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
2021-04-23 19:58:40 +08:00
Jeongik Cha
35bf6b0219 Copy dexpreopt.config only if it exists
Bug: 158843648
Test: m dist when global dexpreopt.config doesn't exist
Change-Id: Iaa8ec04624e16cecceed3f2065945a180a867b1c
2021-04-23 20:15:26 +09:00