Commit graph

62346 commits

Author SHA1 Message Date
Ramy Medhat
fe66d3992b Unset USE_GOMA when using RBE.
Test: Ran rbesetup.sh after setting USE_GOMA
Change-Id: Idf6c1b4f7591aed96d5365e461260060004d4494
2020-08-26 05:47:33 -04:00
Ankit Goyal
5b26b37ab1 Merge "Revert "Add prebuilt bootloader var and add bootloader to img zip"" am: 3c94b2710a
Original change: https://android-review.googlesource.com/c/platform/build/+/1411607

Change-Id: Id56f23e8b80f98e3932b6203b14373e7722175a3
2020-08-26 07:09:38 +00:00
Ankit Goyal
3c94b2710a Merge "Revert "Add prebuilt bootloader var and add bootloader to img zip"" 2020-08-26 06:54:34 +00:00
Ankit Goyal
6805873751 Revert "Add prebuilt bootloader var and add bootloader to img zip"
Revert submission 1402265-cf-x86-bootloader

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=adt3-userdebug&lkgb=6791187&lkbb=6791249&fkbb=6791216, bug 166380489
Reverted Changes:
Id67b7bddd:Add prebuilt bootloader var and add bootloader to ...
Id713eaf20:Added bootloader binary to cf x86 based targets

Change-Id: I89e95d4a6a0534c8217785be9b90632fa110bc41
2020-08-26 06:40:59 +00:00
Treehugger Robot
f1a95d357b Merge "build_image relies on mkuserimg_mke2fs." am: ff6d873873
Original change: https://android-review.googlesource.com/c/platform/build/+/1410752

Change-Id: I148f1257ab3a72a61579050f71188610d56c54f2
2020-08-26 05:21:12 +00:00
Treehugger Robot
ff6d873873 Merge "build_image relies on mkuserimg_mke2fs." 2020-08-26 04:46:56 +00:00
Ram Muthiah
fd32381b72 Merge "Add prebuilt bootloader var and add bootloader to img zip" am: 861f05fb83
Original change: https://android-review.googlesource.com/c/platform/build/+/1406247

Change-Id: I159a8e5c68fe70301c81ce88f21c70e8486447e4
2020-08-26 03:46:09 +00:00
Ram Muthiah
861f05fb83 Merge "Add prebuilt bootloader var and add bootloader to img zip" 2020-08-26 02:59:22 +00:00
Yifan Hong
770234520d build_image relies on mkuserimg_mke2fs.
Add missing dependency.

Test: TH
Bug: 162921175
Change-Id: Ide1fe0b823e5e7a06c6c0252a5bef7bfaf6f7c28
2020-08-25 16:15:30 -07:00
Ram Muthiah
41a03d3aee Add prebuilt bootloader var and add bootloader to img zip
Needed to enable a prebuilt bootloader to make it to the dist and img
directories.

Added a flag to ensure only devices that request will have the update
package populated with a bootloader

Bug: 164917252
Test: local build and Treehugger build
Change-Id: Id67b7bddda14b51a523f794976591c6de04d71ca
2020-08-25 22:12:27 +00:00
Kelvin Zhang
2e41738566 Fix lint errors on ota_utils.py
Pylint reports lot of error on ota_utils.py, because some members of
OPTIONS object aren't defined. This CL moves some definition from
ota_from_target_files.py to ota_utils.py to fix these lint errors.

Test: Make an OTA package
Change-Id: I1e9f255d5919712b13329046c72650dfac184701
2020-08-25 15:58:24 -04:00
Jiyong Park
eccc461d00 Fix HOST_CROSS_OUT
Previously, HOST_CROSS_OUT was defined with the assumption that
windows_x86 is the only supported OS/Arch. In preparatio for Linux/ARM
support, HOST_CROSS_OUT is now defined using HOST_CROSS_OS and
HOST_CROSS_ARCH.

Bug: 159685774
Test: m

Change-Id: I0831c2885db37c44af4fd47bab8481bc885b4b7e
2020-08-25 11:01:11 +09:00
Treehugger Robot
59a4a06170 Merge "Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64" am: 5c9667d1ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1392541

Change-Id: I91121c1be7872d9445612021deb03235811a0200
2020-08-24 23:40:02 +00:00
Treehugger Robot
5c9667d1ac Merge "Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64" 2020-08-24 23:06:59 +00:00
Yifan Hong
e5ab7a241b Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64
Test: m com.android.gki.boot-5.4_5.4-android12-0
Bug: 162888350
Change-Id: I8ac387cc52e498c2790c0b84e866a307fdd1ae8b
2020-08-24 12:23:27 -07:00
Kelvin Zhang
97c6cf5aa6 Merge "Searches for debugfs_static in search path" am: d073e3c87b
Original change: https://android-review.googlesource.com/c/platform/build/+/1405908

Change-Id: Ia3a5d8f6e1c050b375399dfdcb060865bad2aa77
2020-08-24 17:59:10 +00:00
Kelvin Zhang
d073e3c87b Merge "Searches for debugfs_static in search path" 2020-08-24 17:13:06 +00:00
Jeongik Cha
0d1d98157a Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES
If BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES has a numeric value,
it replaces "current" or "system_current" with the version which
the flag indicates.

Bug: 163009188
Test: BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES=29 m, and then check if every vendor
java module's sdk_version is 29 if its sdk_version was current.

Change-Id: I8c7cf21563b984b8e9ef398192031b1f66d96494
2020-08-24 23:16:19 +09:00
Treehugger Robot
dae288e41a Merge "Remove name appendix of .TEST_CONFIG" am: a8c96bfffe
Original change: https://android-review.googlesource.com/c/platform/build/+/1406416

Change-Id: Ib9a774d64bd2965104802f2f96db6f48f9b92fe9
2020-08-22 09:51:30 +00:00
Treehugger Robot
a8c96bfffe Merge "Remove name appendix of .TEST_CONFIG" 2020-08-22 09:40:34 +00:00
Dan Shi
cb49d9986b Remove name appendix of .TEST_CONFIG
aosp/1401989 has a bug to add .TEST_CONFIG after the config file path.
It should be removed.

Bug: 163344047
Test: build and check module-info.json
Change-Id: I5c60250ce26204acf98b79084c5c2839b2adcb56
2020-08-21 17:15:14 -07:00
Kelvin Zhang
dd833dcfb2 Searches for debugfs_static in search path
When signing APks on build server, there might not be an android repo.
Usually deapexer.py will be run from otatools.zip after exctration. So
we should look for debugfs_static in search path

Bug: 165347497
Test: Use sign_apk_from_target_files without android repo
Change-Id: Ifaf91764ca0dc08d010f43a24bfe975a07a71e7f
2020-08-21 14:13:13 -04:00
Treehugger Robot
e783a473e9 Merge "Add extra_test_configs option support in mk" am: 67c930a320
Original change: https://android-review.googlesource.com/c/platform/build/+/1401989

Change-Id: Icd42dd4c7ccf6c7f644e90dd72181ba2272e7c27
2020-08-21 16:50:54 +00:00
Treehugger Robot
67c930a320 Merge "Add extra_test_configs option support in mk" 2020-08-21 16:22:42 +00:00
Treehugger Robot
a1275d0d37 Merge "Merged and dist lists of unused methods from R8" am: 09a0958457
Original change: https://android-review.googlesource.com/c/platform/build/+/1401832

Change-Id: I355788c4c0a1cf38d949dc7457886500034ff2d0
2020-08-21 00:36:49 +00:00
Treehugger Robot
09a0958457 Merge "Merged and dist lists of unused methods from R8" 2020-08-21 00:28:24 +00:00
Treehugger Robot
a92044b46e Merge changes I03bb00b0,I1cf9a0ef,I1c1b7d25 am: 68ec133934
Original change: https://android-review.googlesource.com/c/platform/build/+/1394339

Change-Id: I5c42d906f00f48b9c50a0f167ea0bd6d6dc46d2b
2020-08-20 22:40:51 +00:00
Treehugger Robot
68ec133934 Merge changes I03bb00b0,I1cf9a0ef,I1c1b7d25
* changes:
  add support to non-A/B for multiple kernels, boot images
  add BOARD_GKI_NONAB_COMPAT for non-A/B compatability with GKI
  fix recoveryimage-nodeps
2020-08-20 22:21:45 +00:00
Treehugger Robot
f2ef3217e6 Merge "enable LZ4 ramdisks for aosp_arm64" am: 4709e2be7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1405509

Change-Id: Ia4f3a721281d60ddd29fd10f7af5f94aa530b352
2020-08-20 19:59:12 +00:00
Treehugger Robot
4709e2be7c Merge "enable LZ4 ramdisks for aosp_arm64" 2020-08-20 19:46:20 +00:00
Steve Muckle
2f17246fe7 enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-08-20 10:17:37 -07:00
Dan Shi
0c9a525b98 Add extra_test_configs option support in mk
Bug: 163344047
Test: m -j HelloWorldHostTest hello_world_test HelloWorldTests
Change-Id: Ie63c2a80e01984ac9941d0bad4ad7948e0bb8ac0
2020-08-19 21:22:50 -07:00
Treehugger Robot
86ae05ffab Merge "Searches for debugfs_static in search path" am: 78439f4668
Original change: https://android-review.googlesource.com/c/platform/build/+/1405247

Change-Id: Ifd5e015ae2823fde7e36a3aa067979017275ef44
2020-08-20 00:09:21 +00:00
Treehugger Robot
78439f4668 Merge "Searches for debugfs_static in search path" 2020-08-19 23:27:08 +00:00
Kelvin Zhang
d6b799a627 Searches for debugfs_static in search path
When signing APks on build server, there might not be an android repo.
Usually deapexer.py will be run from otatools.zip after exctration. So
we should look for debugfs_static in search path

Bug: 165347497
Test: Sign using self-service
Change-Id: I608870b0184bd8f5f07afa53355b39de47a97e1c
2020-08-19 16:12:23 -04:00
Tianjie Xu
1f24abb7d1 Merge "Fix the syntax in install-recovery.sh" am: ec23cbb7d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1403105

Change-Id: Ia877cc70d65767e661da8e62e18494de4b37b58b
2020-08-18 21:17:05 +00:00
Tianjie Xu
ec23cbb7d6 Merge "Fix the syntax in install-recovery.sh" 2020-08-18 21:08:07 +00:00
Steven Moreland
9d0f80aa9f Merge "vndservice removed if w/o vndservicemanager" am: 0113aa2070
Original change: https://android-review.googlesource.com/c/platform/build/+/1402963

Change-Id: I2f640d9b1374d19bf9d37c326a4e2ca03e07b96e
2020-08-18 20:16:17 +00:00
Steven Moreland
0113aa2070 Merge "vndservice removed if w/o vndservicemanager" 2020-08-18 20:06:46 +00:00
Treehugger Robot
81dddafd1e Merge "Bypass missing required module check on ASAN SANITIZE_TARGET build" am: 15c2fbfc18
Original change: https://android-review.googlesource.com/c/platform/build/+/1398272

Change-Id: Ieddd1669b88f6ad3d1b036263829107cbd43eb84
2020-08-18 08:02:29 +00:00
Treehugger Robot
15c2fbfc18 Merge "Bypass missing required module check on ASAN SANITIZE_TARGET build" 2020-08-18 07:41:01 +00:00
Treehugger Robot
896997628d Merge "add kernels with untrimmed symbols to aosp_arm64" am: a74903c755
Original change: https://android-review.googlesource.com/c/platform/build/+/1402952

Change-Id: Ib749c0d480c151c926d03e4cf09de548decd6158
2020-08-18 03:03:22 +00:00
Treehugger Robot
a74903c755 Merge "add kernels with untrimmed symbols to aosp_arm64" 2020-08-18 02:54:18 +00:00
Tianjie
e3c31eac61 Fix the syntax in install-recovery.sh
We recently modify the logic in install-recovery.sh to support
non-A/B updates on VAB launched devices. And the position of the
$(getprop ro.boot.slot_suffix) is misplaced for the recovery image.
For example:
"if ! applypatch --check EMMC$(getprop ro.boot.slot_suffix):/dev/block/recovery:SHA1"
should be:
"if ! applypatch --check EMMC:/dev/block/recovery$(getprop ro.boot.slot_suffix):SHA1"

Bug: 156979431
Test: rerun add_image_to_target_file, then validate_target_files
Change-Id: Id2d45e281151a46d66b37ea8fdb7b5cb4ae72e81
(cherry picked from commit e55f62c971)
2020-08-17 18:38:13 -07:00
Treehugger Robot
ea5689db88 Merge "Add function to export default values for RBE related variables" am: 2babdad949
Original change: https://android-review.googlesource.com/c/platform/build/+/1399249

Change-Id: I7a122ffd97aa9619254ef69a4079f4797f10d317
2020-08-18 01:07:28 +00:00
Treehugger Robot
2babdad949 Merge "Add function to export default values for RBE related variables" 2020-08-18 00:51:55 +00:00
Steven Moreland
152a619d34 vndservice removed if w/o vndservicemanager
This binary is for talking to vendor services, and it'll hang if
vndservicemanager is not available. On devices where it isn't supported,
just remove it.

Fixes: 165043609
Test: N/A
Change-Id: I908c8771c37deb79cf36efb10e66b7fff7adcedf
2020-08-17 23:59:58 +00:00
Steve Muckle
2ad32ef3af add kernels with untrimmed symbols to aosp_arm64
For development and debugging it is useful to have boot images with all
kernel symbols exported.

Bug: 163613927
Change-Id: I6118e5f0fff6e9cbc20ecca6bd362a26a79544b1
2020-08-17 15:16:30 -07:00
Colin Cross
a9b9e6e5ff Merged and dist lists of unused methods from R8
Merge all the proguard_usage.zip files produced by the R8 rules and
dist the result.

Bug: 151857441
Test: m TARGET_BUILD_APPS=DocumentsUI dist
Change-Id: I7e6d73241478016093a203dc7bd86407ab86a4ac
2020-08-17 19:31:22 +00:00
Treehugger Robot
e60f9825b9 Merge "Enable configurable audio policy on generic_system" am: baade4a3c4
Original change: https://android-review.googlesource.com/c/platform/build/+/1395771

Change-Id: I28e390955a21bda06cea965dab84abd243730272
2020-08-17 08:56:39 +00:00