Commit Graph

59048 Commits

Author SHA1 Message Date
Jiyong Park 6dd5383c37 Merge changes from topics "remove_bootimage_sysprops", "sysprop"
* changes:
  Drop the dependency from vendor/build.prop to system/build.prop
  Remove ro.bootimage.* sysprops
  ro.build.expect.* sysprops are created in a separate rule
  Make use of ADDITIONAL_ODM_PROPERTIES
  Refactor post_process_props.py
  remove code for default.prop
  Make more use of ADDITIONAL_VENDOR_PROPERTIES
  ADDITIONAL_*_PROPERTIES are props determined by the build system
2020-05-29 01:01:52 +00:00
Yo Chiang 06d3445271 Merge "Check module existence with ALL_MODULES subvars" am: 0dcb96c204
Change-Id: Ic6009117a309bd532ddd50daff8815eab74c6548
2020-05-28 10:30:45 +00:00
Yo Chiang 0dcb96c204 Merge "Check module existence with ALL_MODULES subvars" 2020-05-28 10:12:52 +00:00
Treehugger Robot 08095b3301 Merge "Fix up recovery_text_res" am: 9e424a5a60
Change-Id: Id24ae6b16a83c93aa317fde0fed8215df99e202c
2020-05-28 08:33:46 +00:00
Treehugger Robot 9e424a5a60 Merge "Fix up recovery_text_res" 2020-05-28 08:23:00 +00:00
Dan Willemsen 9767223dc5 Fix up recovery_text_res
First, make it safer for incremental builds. We used to just be
depending on the bootable/recovery/tools/recovery_l10n/res dir as a
dependency, but that would only trigger a rebuild if a direct child
file/directory was added or removed (so essentially, when a translation
was addded or removed). If a translation was updated, it wouldn't
re-trigger recovery_text_res.

So instead of depending on the directory, depend on the results from
running `find` to list all of the contents in that directory.

Next, move it out of PACKAGING. `m installclean`, which runs in between
incremental builds on our build servers, deletes the obj/PACKAGING
directory. So when recovery_text_res used that directory, we were having
to rebuild it on every incremental build, which isn't optimal when it
takes nearly 90s to build.

So with:
 $ lunch aosp_coral-eng
 $ m bootimage
 $ m installclean
 $ m bootimage

The second `m bootimage` went from executing 666 actions in 93s to
executing 658 actions in 6s.

Finally, remove the last uses of $(call include-path-for,recovery),
since they were all in this file (and they weren't using it for include
paths...). We'd like to remove all of these and switch them to header
libraries or other use cases, but in this case, it's just shorter to use
the real path.

Test: treehugger
Test: m bootimage;
      touch bootable/recovery/tools/recovery_l10n/res/values/strings.xml
      m bootimage
Test: m bootimage; m installclean; m bootimage

Change-Id: I005592e49443aab45ed039a2f0c63f7a69035565
2020-05-27 19:37:03 -07:00
J. Avila 3f6560e626 Add build support for LZ4 ramdisks
Ramdisks are currently compressed using gzip, which is generally
smaller, but slower to decompress than lz4. Provide an option for an
lz4 scheme to reduce the time taken to unpack initramfs during boot.

Bug: 156129966
Signed-off-by: J. Avila <elavila@google.com>
Change-Id: Iac9538e6ee6ec51e6b487de2101f53bb5d9c54c8
2020-05-27 23:44:33 +00:00
Treehugger Robot 62067081f1 Merge "Strip debug symbols from modules" am: a29edba6e8
Change-Id: Id69bfb9745152ac34572483538f794157feb46d4
2020-05-27 21:02:37 +00:00
Treehugger Robot a29edba6e8 Merge "Strip debug symbols from modules" 2020-05-27 20:46:16 +00:00
Beverly Tai 39b8113e2c Merge "Revert "Retire mainline.mk"" am: 7943056adc
Change-Id: I98b24f4046d297cfb3de230adaf3931487756d71
2020-05-27 14:16:30 +00:00
Beverly Tai 7943056adc Merge "Revert "Retire mainline.mk"" 2020-05-27 14:02:57 +00:00
Beverly Tai 4003bd9def Revert "Retire mainline.mk"
This reverts commit 60c0064902.

Reason for revert: build breakages

Change-Id: Ie8304d1979c50578901efed77fb31281c336505c
Fixes: 157548597
2020-05-27 13:28:22 +00:00
Treehugger Robot d5ec97ea5b Merge "Create emulator_* devices for emulators" am: 6a00738ed8
Change-Id: I36e5d7a963290c55bcb11e6ba94624ccf0d8649d
2020-05-27 11:42:07 +00:00
Treehugger Robot 6a00738ed8 Merge "Create emulator_* devices for emulators" 2020-05-27 11:27:58 +00:00
Treehugger Robot bafaa5b25e Merge "Retire mainline.mk" am: 8ecc4d5710
Change-Id: Ia7169a2a22e5e98a8742f2586e6e1997334d79da
2020-05-27 10:46:17 +00:00
Treehugger Robot 8ecc4d5710 Merge "Retire mainline.mk" 2020-05-27 10:31:28 +00:00
SzuWei Lin c73db784b9 Create emulator_* devices for emulators
aosp_arm64 has no emulators after the patch:

https://android-review.googlesource.com/c/platform/build/+/1286895

The patch creates all other emulator_* devices by cloning from
generic_*, and modify all sdk_phone_* to use them.

Bug: 111538404
Test: build sdk_phone_armv7-userdebug
Test: build sdk_phone_x86_64-userdebug
Test: build sdk_phone_x86-userdebug
Change-Id: I2b82e999ea919f005729f322cd948e6b72ba6843
2020-05-27 16:41:44 +08:00
Jiyong Park a9c3220368 Drop the dependency from vendor/build.prop to system/build.prop
The former doesn't use anything from the latter. The dependency is not
needed.

Bug: 117892318
Test: m
Change-Id: I61aeea9feb1ac4467af4f185f3d6930b03145afd
2020-05-27 12:52:44 +09:00
Jiyong Park 0f3ad31a81 Remove ro.bootimage.* sysprops
ro.bootimage.build.date.* are not used anywhere.
ro.bootimage.build.fingerprint was used in the recovery mode, which has
now been switched to ro.build.fingerprint.

Bug: 117892318
Test: m
Change-Id: I3776c4154f86ddb908b24c6899037c6a7df037df
2020-05-27 12:52:44 +09:00
Jiyong Park 3a2e95a63e ro.build.expect.* sysprops are created in a separate rule
This change is required to unify the build rules for */build.prop files;
The rules shouldn't have partition-specific actions.

Bug: 117892318
Test: m
Manually inspect ro.build.expect.[bootloader|baseband] props in
vendor/build.prop

Change-Id: I3b29b2728f779a9d7e1d71a5aa69b02ea940b3c6
2020-05-27 12:52:44 +09:00
Jiyong Park ca9b02c1ce Make use of ADDITIONAL_ODM_PROPERTIES
Properties that were defined in the build rule for odm/build.prop are
now defined via ADDITIONAL_ODM_PROPERTIES.

Bug: 117892318
Test: m
Change-Id: I6220e217d0724b6e27127786e7a908e1e662d1a0
2020-05-27 12:52:44 +09:00
Jiyong Park ae55638f75 Refactor post_process_props.py
The script is refactored to not parse lines everytime a prop is looked
up or updated.

Also it is now built using python_binary_host.

Bug: 117892318
Test: m

Change-Id: I1677ca5aa919c54b7b0740fdc52e1399009f9a12
2020-05-27 12:52:44 +09:00
Jiyong Park 58dd353a07 remove code for default.prop
default.prop files are gone. Remove the code in post_process_prop.py
that handles the file.

Bug: 1313599
Test: m

Change-Id: I3b4ff4adac57a406b70300d34ece7028cb52eb2d
2020-05-27 12:52:43 +09:00
Jiyong Park f2b944ccea Make more use of ADDITIONAL_VENDOR_PROPERTIES
Properties that were defined in the build rule for vendor/build.prop are
now defined via ADDITIONAL_VENDOR_PROPERTIES.

Bug: 117892318
Test: m
Change-Id: Ib3dc9d001a8dcd0aa38f1acae384a96b67b5af8a
2020-05-27 12:52:43 +09:00
Jiyong Park 57f51f1693 ADDITIONAL_*_PROPERTIES are props determined by the build system
This change defines ADDITIONAL_<partition>_PROPERTIES to store properties
determined by the build system itself.

ADDITIONAL_SYSTEM_PROPERTIES was originally ADDITIONAL_BUILD_PROPERTIES.
ADDITIONAL_VENDOR_PROPERTIES was originally FINAL_VENDOR_DEFAULT_PROPERTIES.
ADDITIONAL_PRODUCT_PROPERTIES has been there and thus not changed.
ADDITIONAL_ODM_PROPERTIES is newly defined, although it is empty now.

In addition, ADDITIONAL_VENDOR_PROPERTIES are now defined in
core/main.mk along with other ADDITIONAL_*_PROPERTIES.

Bug: 117892318
Test: m

Change-Id: Ic41bba2e5695355436ac8df353866cfc044e1e0b
2020-05-27 12:52:43 +09:00
Howard Chen 67a7b6d830 Merge "Add tinyhostless to mainline_system.mk" am: c0ea7e89b8
Change-Id: I5545cec112a88122fe09b834cd386ca47363600e
2020-05-27 02:44:18 +00:00
Howard Chen c0ea7e89b8 Merge "Add tinyhostless to mainline_system.mk" 2020-05-27 02:41:37 +00:00
Treehugger Robot acb4079c27 Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" am: aa0584c22d
Change-Id: I3bb8a8b2f0997f289e532e61b320690a3bf42157
2020-05-27 02:38:14 +00:00
Yo Chiang 3b75a5943a Merge "Remove mainline_arm64.mk" am: e32703d3be
Change-Id: I015632ecf33407e47d1b6f13ca8c0c510124aeb8
2020-05-27 02:38:03 +00:00
Yo Chiang 60c0064902 Retire mainline.mk
We've converted all known users of mainline.mk to use
mainline_system.mk. Don't include mainline.mk directly in the future,
instead include mainline_system.mk and other partition specific
makefiles. Remove mainline.mk to prevent people from accidentally
including it again.

Bug: 141443017
Test: TH
Change-Id: Id161f29951982a100482a6201130adeebdb49846
2020-05-27 02:29:02 +00:00
Treehugger Robot aa0584c22d Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" 2020-05-27 02:27:09 +00:00
Yo Chiang e32703d3be Merge "Remove mainline_arm64.mk" 2020-05-27 02:26:26 +00:00
J. Avila a2ceec665d Strip debug symbols from modules
The size of the ramdisk has greatly increased, which can be a source of
boot time regressions. Strip the modules of debug symbols for the vendor
ramdisk and vendor partitions; vendor stripping can be skipped via BOARD
config.

Bug: 156395749
Signed-off-by: J. Avila <elavila@google.com>
Merged-In: I248d4e2097992f00975b344b5da41aa5d8016812
Change-Id: I248d4e2097992f00975b344b5da41aa5d8016812
2020-05-26 23:35:26 +00:00
Treehugger Robot 267a1bf446 Merge "depmod: pair in a modules.load.recovery on BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD" am: a74d425017
Change-Id: Ie50ca543785faf47178b42bf0b35e8499c9b0c5b
2020-05-26 21:21:26 +00:00
Treehugger Robot a74d425017 Merge "depmod: pair in a modules.load.recovery on BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD" 2020-05-26 21:10:54 +00:00
Treehugger Robot de33c9c26e Merge "Fix type error" am: fdc392b245
Change-Id: If3e2f0183039e00cb4184f15dd19dd742857dd56
2020-05-26 20:02:57 +00:00
Treehugger Robot fdc392b245 Merge "Fix type error" 2020-05-26 19:24:41 +00:00
Kousik Kumar b0f055db13 Add RBE_CXX_COMPARE variable to locally disable compare mode for C++
When we do 64-32 migration, we want compare mode to be present only for
non-c++ actions as it would impact performance on 32-core machines
otherwise.

Bug: b/157414300
Test: Ran a build with "RBE_CXX_LINKS="true" RBE_CXX_LINKS_EXEC_STRATEGY="remote" RBE_CXX_COMPARE="false" RBE_compare="true" use_rbe mmma bionic"
and observed that local-executions happened only for link actions and
not for C++ actions.

Change-Id: Ia972c74d804085196a7b6ec755af63042c6b3909
2020-05-26 11:57:02 -07:00
Treehugger Robot ada61a9af5 Merge "Generate product build props always" am: 223c0f66d5
Change-Id: I7c82ba73c99b95a38146ff470ba249d160d2c02f
2020-05-26 17:40:55 +00:00
Treehugger Robot 223c0f66d5 Merge "Generate product build props always" 2020-05-26 17:26:01 +00:00
Yo Chiang cb559ac3d8 Remove mainline_arm64.mk
mainline_arm64 is broken for quite some time. Let's just remove it
rather than trying to fix it.
IIUC this was a testing ground for mainline_system.mk when it was first
introduced. Now we have plenty of products that use mainline_system.mk
(e.g. mainline_system_arm64, aosp_arm64, aosp_<pixel>, ...).

Bug: 141443017
Test: TH
Change-Id: I8e0825b2d94134fd8e9e3edc5e2aa15dbcdf10ba
Merged-In: I08990b70d45c0663a9700f41b670513674bf7e97
2020-05-26 14:09:25 +00:00
Howard Chen 2f6bb93178 Add tinyhostless to mainline_system.mk
The tinyhostless module is provided by AOSP and is required by Mediatek
devices.

Test: build aosp_wembley-userdebug
Bug: 157109906
Change-Id: I2a1c4957c19fd4cbd60744d2d9cb534f19d3f239
2020-05-26 02:51:14 +00:00
Treehugger Robot 787ee95af2 Merge "Allow more than one '=' in avb_extra_custom_image_extra_args." am: 6d412db1b3
Change-Id: I935e285afa6fe4b17932849d85a7645f175a88c0
2020-05-25 22:21:11 +00:00
Treehugger Robot 6d412db1b3 Merge "Allow more than one '=' in avb_extra_custom_image_extra_args." 2020-05-25 22:08:12 +00:00
Yo Chiang a0359ca828 releasetools: Fix non-existent required dependency
HOST module img_from_target_files has non-existent required: zip2zip
HOST module releasetools_py3_test has non-existent required: otatools
HOST module releasetools_test has non-existent required: otatools

Bug: 7456955
Test: TH presubmit
Test: atest releasetools_test # Test result doesn't change
Change-Id: I4fa4fb9c120fda5d4cb309b1e3a2660c3387eb7f
2020-05-25 17:14:51 +08:00
Hongguang Chen 883eecbc4b Allow more than one '=' in avb_extra_custom_image_extra_args.
avb_extra_custom_image_extra_args can be set to
'oem=--signing_helper_with_files=/tmp/avbsigner.sh' on signing server.
The second '=' shouldn't be splitted in this case.

BUG: 154171021
Test: Manually sign target zip files which has custom images.
  sign_target_files_apks -d certs --avb_extra_custom_image_key \
    oem=oem_rsa4096.pem --avb_extra_custom_image_algorithm \
    oem=SHA256_RSA4096 --avb_extra_custom_image_extra_args \
    oem="--signing_helper_with_files=/tmp/avbsigner.sh" \
    xxxx-target_files.zip signed.zip

Change-Id: I815d574f791734d4c6a25a9f8d827b5b4f93d7cc
2020-05-24 21:10:44 -07:00
Treehugger Robot 381b86da62 Merge "Delete deps-license target." am: 95fc5e76a6
Change-Id: If7cd6f4365894902e925a0a79fb67eb2a35f435b
2020-05-21 21:51:40 +00:00
Treehugger Robot 95fc5e76a6 Merge "Delete deps-license target." 2020-05-21 21:37:06 +00:00
Tianjie Xu 0dbde58c9b Merge "Add an option to input the boot variables for OTA package generation" am: 1ca7b10456
Change-Id: I33bbd3bb27fcba8f6a40e7c79b78c6751a7fc817
2020-05-21 18:13:36 +00:00
Tianjie Xu 1ca7b10456 Merge "Add an option to input the boot variables for OTA package generation" 2020-05-21 17:58:21 +00:00