Commit Graph

27520 Commits

Author SHA1 Message Date
Colin Cross
2c066b2aeb Merge "Rename T to Tiramisu" into sc-dev-plus-aosp 2021-07-26 16:30:33 +00:00
Colin Cross
a45d0c890e 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
2021-07-23 21:05:16 +00:00
Colin Cross
f79ec6e4ab Merge "Remove Fuchsia support from Make" am: 046531066c am: 49e7e9d203
Original change: https://android-review.googlesource.com/c/platform/build/+/1773208

Change-Id: I9bda1c3a34cfa88f44cfa1f026a2efa35c3272f5
2021-07-23 18:38:34 +00:00
Colin Cross
046531066c Merge "Remove Fuchsia support from Make" 2021-07-23 17:15:45 +00:00
Jose "Pepe" Galmes
3f51d7ec7a Merge "Support for dexopt postprocessing in merge_target_files." am: 81005b13f7 am: 7386f15fbb
Original change: https://android-review.googlesource.com/c/platform/build/+/1774125

Change-Id: Iec6e9339afdd0da153ffe30b5914de8b18614a3c
2021-07-23 05:22:21 +00:00
Jose "Pepe" Galmes
81005b13f7 Merge "Support for dexopt postprocessing in merge_target_files." 2021-07-23 04:42:43 +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
TreeHugger Robot
18eac2c301 Merge "Don't use mainline prebuilts for coverage builds." into sc-dev am: d932280147
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15358466

Change-Id: If8a86300a70199380b8bf2885eeac909480e743d
2021-07-22 17:21:47 +00:00
TreeHugger Robot
d932280147 Merge "Don't use mainline prebuilts for coverage builds." into sc-dev 2021-07-22 16:37:03 +00:00
TreeHugger Robot
922a3d0086 Merge "Don't use prebuilt modules for sanitizer builds." into sc-dev am: 34828f27c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15358465

Change-Id: Ic33048fac01e258912f94cd44d29b54c764f9cba
2021-07-22 16:14:50 +00:00
TreeHugger Robot
34828f27c7 Merge "Don't use prebuilt modules for sanitizer builds." into sc-dev 2021-07-22 15:43:13 +00:00
Mathew Inwood
31167aeaf4 Don't use mainline prebuilts for coverage builds.
Test: TH
Bug: 192556458
Bug: 159241638
Change-Id: Id29e273c1df1fa27a038ebdcff1a17acca58bd46
2021-07-22 12:10:57 +01:00
Mathew Inwood
2c2e1b5a1e Don't use prebuilt modules for sanitizer builds.
Prebuilt modules do not provide sanitizer binaries to using them in this
context is unsafe.

Bug: 194067130
Test: TH
Change-Id: I3682ae9ad963a8cd13bb395fe84dae515dc6d30f
2021-07-22 12:01:19 +01: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
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
11079b3d3f 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
2021-07-20 16:48:13 +00: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
e649ffe283 Merge changes from topic "ota-package-nonab" am: ecef6fa224 am: 271896e081
Original change: https://android-review.googlesource.com/c/platform/build/+/1771589

Change-Id: I5f2d84e38e382ea4598b91a499df58a3c6b668e6
2021-07-20 03:27:20 +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
Yifan Hong
ec91a39248 Only build OTA package for non-A/B with recovery
Change I4e5adc3f42a5 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
Merged-In: I8d09ad5c62d44699eb910ff62d32044bd97e8e44
2021-07-19 10:46:19 -07: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
8ac71d891a Merge "Revert "Build OTA when boot image exists even without kernel or recovery fstab"" am: fa26e5b8db am: f4494732f5
Original change: https://android-review.googlesource.com/c/platform/build/+/1771586

Change-Id: Ib5e2911aeabe2e923afed202bb688ab63d950882
2021-07-19 17:04:52 +00: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
TreeHugger Robot
9bbb60e141 Merge changes from topic "ota_for_generic_boot_image" into sc-dev
* changes:
  Also extract kernel configs from boot image.
  Build OTA when boot image exists even without kernel or recovery fstab
2021-07-16 20:23:47 +00:00
Treehugger Robot
e5f0b9f66e Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS." am: bcb4776446 am: 73588ab86d
Original change: https://android-review.googlesource.com/c/platform/build/+/1736332

Change-Id: I903241f6a8186a2470b032b994583968aa1731eb
2021-07-16 17:55:24 +00:00
Yifan Hong
49b198c105 Merge changes from topic "ota_for_generic_boot_image" am: d15c78090c am: 035f7a567e
Original change: https://android-review.googlesource.com/c/platform/build/+/1767047

Change-Id: I24d53771844a0eee3dcc2e1cd37ccbb48baa255e
2021-07-16 17:31:03 +00:00
Treehugger Robot
bcb4776446 Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS." 2021-07-16 17:22:47 +00:00
Yifan Hong
cb21f9edc8 Also extract kernel configs from boot image.
On devices with prebuilt generic boot image:
  TARGET_NO_KERNEL := true
  BOARD_PREBUILT_BOOTIMAGE is set
In this case, the process for extracting the kernel
config and version must also try extracting from the
prebuilt boot image.

Test: build on device with prebuilt boot image
Fixes: 193588301
Change-Id: I43dd8e206bcd1c9f3f5f51869f126791c50af01a
Merged-In: I43dd8e206bcd1c9f3f5f51869f126791c50af01a
2021-07-16 09:52:42 -07:00
Yifan Hong
73f01711f2 Build OTA when boot image exists even without kernel or recovery fstab
On devices with a prebuilt boot image, TARGET_NO_KERNEL
may be set to enable signing, etc. In this case we still
want to build the OTA package.

Test: m otapackage on a device with generic boot image
      (where TARGET_NO_KERNEL is set)
Bug: 193588301
Change-Id: I4e5adc3f42a516ac0e2f66c313dbe34a469ebe05
Merged-In: I4e5adc3f42a516ac0e2f66c313dbe34a469ebe05
2021-07-16 09:52:42 -07: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
satayev
09e9471eac Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS.
... but not really: move it back to PRODUCT_BOOT_JARS before the list is
passed to soong. This ensures that core-icu4j remains on the boot image
for system health reasons and maintains the status quo.

core-icu4j is the only APEX jar (aside from ART jars) that is ever meant
to be part of the boot image. This is an implementation detail that most
devs don't and shouldn't care about. Instead, most devs assume that
PRODUCT_UPDATABLE_BOOT_JARS is where all apex jars are meant to go. In
the follow ups, PRODUCT_UPDATABLE_BOOT_JARS would be renamed to
PRODUCT_APEX_BOOT_JARS, regardless of the updatable property.

This also solves the problem where vendors add /system and /system_ext
boot jars to PRODUCT_BOOT_JARS outside of default_art_config.mk and
essentially violate the ordering requirement: all /apex jars come after
/system and /system_ext.

Bug: 191127295
Test: atest CtsClasspathsTestCases derive_classpath_test
Change-Id: Ifdfdd02519a0f5baea45619523f0c1eb8be186bc
2021-07-16 14:50:29 +01:00
Yifan Hong
ff2e24d6f9 Build OTA when boot image exists even without kernel or recovery fstab
On devices with a prebuilt boot image, TARGET_NO_KERNEL
may be set to enable signing, etc. In this case we still
want to build the OTA package.

Test: m otapackage on a device with generic boot image
      (where TARGET_NO_KERNEL is set)
Bug: 193588301
Change-Id: I4e5adc3f42a516ac0e2f66c313dbe34a469ebe05
2021-07-15 12:57:47 -07:00
Yifan Hong
b1627779fb Also extract kernel configs from boot image.
On devices with prebuilt generic boot image:
  TARGET_NO_KERNEL := true
  BOARD_PREBUILT_BOOTIMAGE is set
In this case, the process for extracting the kernel
config and version must also try extracting from the
prebuilt boot image.

Test: build on device with prebuilt boot image
Fixes: 193588301
Change-Id: I43dd8e206bcd1c9f3f5f51869f126791c50af01a
2021-07-15 12:57:47 -07:00
Martin Stjernholm
67748d9338 Merge "Document how APEXes are identified in the boot jar variables." am: 1b00d58d93 am: 79d4cf851f
Original change: https://android-review.googlesource.com/c/platform/build/+/1756709

Change-Id: I78bc6dd66e9f3009df87050a838663022f6482f1
2021-07-15 19:51:34 +00:00
TreeHugger Robot
8044ebbf7c Merge "Fix typo in MODULE_BUILD_FROM_SOURCE variable." into sc-dev am: 6f0062ede9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15300830

Change-Id: Ibc2b6d1db9dac75db0c9c5427a15b9c7f6345f37
2021-07-15 19:00:53 +00:00
Martin Stjernholm
1b00d58d93 Merge "Document how APEXes are identified in the boot jar variables." 2021-07-15 18:57:00 +00:00
Martin Stjernholm
b2de2d6f0c Fix typo in MODULE_BUILD_FROM_SOURCE variable.
Cherry-picked from http://ag/15300830.

Test: env MODULE_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I2056b198bc0b944a6736ff21077b902df13c1479
Merged-In: I2056b198bc0b944a6736ff21077b902df13c1479
2021-07-15 16:23:15 +01:00
Martin Stjernholm
2d6bfdb30c Fix typo in MODULE_BUILD_FROM_SOURCE variable.
Test: env MODULE_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I2056b198bc0b944a6736ff21077b902df13c1479
2021-07-15 16:15:04 +01:00
Treehugger Robot
d622e08647 Merge "dexpreopt.config should be created even though unbundled image is built" am: e01cfe4896 am: 10b90baa51
Original change: https://android-review.googlesource.com/c/platform/build/+/1730113

Change-Id: I54f082381d01c57d5fed3be25fdf764ff58431ce
2021-07-15 09:28:41 +00:00
Treehugger Robot
e01cfe4896 Merge "dexpreopt.config should be created even though unbundled image is built" 2021-07-15 03:41:30 +00:00
Martin Stjernholm
3a52c4f4fd Build the ART module from source if other Mainline modules are.
Cherry-picked from http://ag/15277370.

Test: env MODULES_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I718d3878e9d5f5e710fa3d835a209184b633af48
Merged-In: I718d3878e9d5f5e710fa3d835a209184b633af48
2021-07-14 21:02:10 +01:00
David Gross
74e7f990ac Merge "Fix bitrot: RSTest_CompatLib[19] tests stopped building" am: 304da3988d am: 29e8a85b4e
Original change: https://android-review.googlesource.com/c/platform/build/+/1761125

Change-Id: I122676fb7a0f5eb6ae608ee02ff1648c85b3c1ef
2021-07-14 19:07:43 +00:00
Martin Stjernholm
492c8514c9 Build the ART module from source if other Mainline modules are. am: 06a7034659
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15277370

Change-Id: I9ec4b63142653d1ec68d836729898256942bad89
2021-07-14 18:47:31 +00:00
David Gross
304da3988d Merge "Fix bitrot: RSTest_CompatLib[19] tests stopped building" 2021-07-14 18:34:58 +00:00
Jeongik Cha
b26bf58e12 dexpreopt.config should be created even though unbundled image is built
Bug: 188179858
Test: compare dexpreopt_config.zip files from
 1. TARGET_BUILD_UNBUNDLED_IMAGE=true m dexpreopt_config_zip
 2. m dexpreopt_config_zip
(note that m clean should run between steps)

Change-Id: I92623b59e4fcac397c7fed3d7ab1070fe5281027
2021-07-14 18:52:01 +09:00
Martin Stjernholm
06a7034659 Build the ART module from source if other Mainline modules are.
Test: env MODULES_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I718d3878e9d5f5e710fa3d835a209184b633af48
2021-07-13 23:56:55 +01:00
Alexander Smundak
0b56290fbc Merge "Add mkpatsubst" am: 4b8d81b41c am: 5f8eba778e
Original change: https://android-review.googlesource.com/c/platform/build/+/1764007

Change-Id: Ic185cdc7fa3ab3c3f7852bcac9065e4164e6a951
2021-07-13 22:36:50 +00:00