Commit Graph

25241 Commits

Author SHA1 Message Date
Colin Cross
8b21e4e7d4 Merge "Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true" 2020-08-31 04:20:18 +00:00
Xin Li
c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Colin Cross
b0f3a4d04c Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true
The platform availability check was erroring incorrectly for the
libstatssocket module in master-art-host builds.  Nothing being
built depended on libstatssocket, but the check would still
error because libstatspull_test was defined in the branch but
unused in the build.

When ALLOW_MISSING_DEPENDENCIES=true is set and a module fails
the check add an additional dependency on a rule that prints
the error message.  This will show the error and fail the build
if an unavailable module is requested to be installed, while
allowing the build to proceed if there are no unavailable
modules in the dependency graph.

Fixes: 154888298
Test: m build-art-host TARGET_BUILD_UNBUNDLED=true ALLOW_MISSING_DEPENDENCIES=true libstatspull_test -k
Test: m build-art-host TARGET_BUILD_UNBUNDLED=true ALLOW_MISSING_DEPENDENCIES=true
Change-Id: I1d57afe60a75d65128e59f794243a0414cbc82f6
2020-08-28 13:32:20 -07:00
Treehugger Robot
0855f31d2e Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" am: 947cb0fd87 am: 589439eadf
Original change: https://android-review.googlesource.com/c/platform/build/+/1404655

Change-Id: Idb5959bdcdaba51e84a8da7f23e32c33d0c7070f
2020-08-28 04:59:26 +00:00
Ram Muthiah
fc453ed5a0 Merge "Revert "Revert "Add prebuilt bootloader var and add bootloader t..."" am: 2ad69ab090 am: fe24aafffe
Original change: https://android-review.googlesource.com/c/platform/build/+/1412074

Change-Id: I8bca48049df321a87d3312b2d925293618c5cb35
2020-08-28 04:59:17 +00:00
Treehugger Robot
947cb0fd87 Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" 2020-08-28 04:26:49 +00:00
Ram Muthiah
2ad69ab090 Merge "Revert "Revert "Add prebuilt bootloader var and add bootloader t..."" 2020-08-28 04:04:24 +00:00
Treehugger Robot
cc208c63b4 Merge "Fix HOST_CROSS_OUT" am: bcb644ee3f am: 696a64b2ab
Original change: https://android-review.googlesource.com/c/platform/build/+/1409827

Change-Id: I596c91f652e72b0b2b2bda5e0c9eb2f3491e1702
2020-08-28 00:13:25 +00:00
Jaewoong Jung
fb91011ba2 Merge "Deduplicate my_compat_dist entries globally." am: 3a4307d237 am: 1d5f659946
Original change: https://android-review.googlesource.com/c/platform/build/+/1413709

Change-Id: If99a733134a2cc9b1180306a143245df7f465dcd
2020-08-27 23:52:27 +00:00
Treehugger Robot
bcb644ee3f Merge "Fix HOST_CROSS_OUT" 2020-08-27 23:50:55 +00:00
Colin Cross
bd3821451a Use rules to create partition compatibility symlinks
Creating the symlinks between partitions (e.g /system/vendor to /vendor)
inside the packaging rules requires duplicating the creation in the
system.img rule as well as in the the target-files.zip rule, which can
cause the target-files.zip rule to fail in soong_zip when the symlink
is removed and recreated by the system.img rule.

Now that our Ninja fork supports symlinks in the build graph, move
the symlink creating to their own rules and add them to the list
of files that the image creation and packaging rules depend on.

Fixes: 161280160
Test: m nothing
Test: treehugger
Change-Id: I0f4d16b57b3052efb12a1f086506f1298c22ec84
2020-08-27 15:06:23 -07:00
Ram Muthiah
0c4a352409 Revert "Revert "Add prebuilt bootloader var and add bootloader t..."
Revert submission 1411608-revert-1402265-cf-x86-bootloader-XGKLNEQAPF

Reason for revert: Breakage originally caused by change was fixed. Refer to tracking bug for details.
Reverted Changes:
I89e95d4a6:Revert "Add prebuilt bootloader var and add bootlo...
I8fe199351:Revert "Added bootloader binary to cf x86 based ta...

Bug: 166380489
Bug: 164917252
Test: local build and Treehugger build
Change-Id: Ia895aedd77f2ec825aefecaf74c6dfc1ce631c93
2020-08-27 13:18:24 -07:00
Jaewoong Jung
046702a6ef Deduplicate my_compat_dist entries globally.
Fixes: 164319611
Test: m TARGET_PRODUCT=aosp_x86_64 mts dist
Change-Id: Ie47e355ded0ce0221988a405fc77546a4a752c38
2020-08-27 13:10:40 -07:00
Ankit Goyal
1811209e66 Merge "Revert "Add prebuilt bootloader var and add bootloader to img zip"" am: 3c94b2710a am: 5b26b37ab1
Original change: https://android-review.googlesource.com/c/platform/build/+/1411607

Change-Id: Ic7a5682ed5f49dfe5f27e44e2db7796f49cbc203
2020-08-26 07:24:47 +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
Ram Muthiah
cdb993b2d4 Merge "Add prebuilt bootloader var and add bootloader to img zip" am: 861f05fb83 am: fd32381b72
Original change: https://android-review.googlesource.com/c/platform/build/+/1406247

Change-Id: Iaa6f1480377de84a42d1cdf5e41cc64982d26718
2020-08-26 04:06:21 +00:00
Ram Muthiah
861f05fb83 Merge "Add prebuilt bootloader var and add bootloader to img zip" 2020-08-26 02:59:22 +00: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
Ramy Medhat
8f8d1126aa Set RBE_DIR default value to point to prebuilts in tree.
The new default points to prebuilts/remoteexecution-client/live.

Also sets the default exec strategy of Javac/R8/D8 to remote local
fallback.

Test: simple one action build
Bug: b/166273085
Change-Id: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
Merged-In: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
2020-08-25 16:31:40 +00: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
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
efb94aa8eb Merge "Remove name appendix of .TEST_CONFIG" am: a8c96bfffe am: dae288e41a
Original change: https://android-review.googlesource.com/c/platform/build/+/1406416

Change-Id: Ia0276806d9fbe3124d2e5002b6e79d8bf66d1ac6
2020-08-22 10:05:09 +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
Treehugger Robot
759d98d55f Merge "Add extra_test_configs option support in mk" am: 67c930a320 am: e783a473e9
Original change: https://android-review.googlesource.com/c/platform/build/+/1401989

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

Change-Id: I3556843e4c2a48abcacfa91caa6795747cba3e22
2020-08-21 00:49:14 +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
b0875556a7 Merge changes I03bb00b0,I1cf9a0ef,I1c1b7d25 am: 68ec133934 am: a92044b46e
Original change: https://android-review.googlesource.com/c/platform/build/+/1394339

Change-Id: I4c54966cb63eeb0c4c7e84addafb5ab356b86fe3
2020-08-20 22:55:41 +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
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
2a982e5b0d Merge "Bypass missing required module check on ASAN SANITIZE_TARGET build" am: 15c2fbfc18 am: 81dddafd1e
Original change: https://android-review.googlesource.com/c/platform/build/+/1398272

Change-Id: Id5de7d1e96942cc24d2556bfb90b35ac818720b1
2020-08-18 08:18:44 +00:00
Treehugger Robot
15c2fbfc18 Merge "Bypass missing required module check on ASAN SANITIZE_TARGET build" 2020-08-18 07:41:01 +00: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
5bd18febfc Merge "Include vendor overrides in system prop if not split" am: 2e80113ad2 am: 0508bd6842
Original change: https://android-review.googlesource.com/c/platform/build/+/1399399

Change-Id: I2ba4e4c2a169e9cfc29ce6ba7fe3f121e65feaa3
2020-08-14 18:35:34 +00:00
Treehugger Robot
2e80113ad2 Merge "Include vendor overrides in system prop if not split" 2020-08-14 18:03:31 +00:00
Treehugger Robot
0d15d49dcd Merge "Document unbundle build behavior" am: d67e588939 am: 02694ffe29
Original change: https://android-review.googlesource.com/c/platform/build/+/1358105

Change-Id: Icb92952b4cfa4e964784efde8bc239c9957f55f4
2020-08-14 01:43:46 +00:00
Garfield Tan
04714da51c Include vendor overrides in system prop if not split
Bug: 163854285
Test: m on crosshatch. Vendor overrides are included in
system/build.prop on legacy devices.

Change-Id: Ib134f934de8546af3dff27312f6877eafe5ed22c
2020-08-13 18:42:43 -07:00
Treehugger Robot
d67e588939 Merge "Document unbundle build behavior" 2020-08-14 01:14:59 +00:00
Treehugger Robot
b1103b6339 Merge "Set RBE_DIR default value to point to prebuilts in tree." am: 9c81a78e97 am: 43044f0bb9
Original change: https://android-review.googlesource.com/c/platform/build/+/1397927

Change-Id: Ia31e86c94d7d8a87b6feba578e02e4d68fc63b48
2020-08-13 22:45:23 +00:00
Paul Scovanner
86d2713339 Update Security String to 2020-10-05 am: 5eec497aa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12362480

Change-Id: Icd45631fdd9b7f1c14e85eba81d1bb2d177c30a6
2020-08-13 19:39:55 +00:00
Ramy Medhat
ba6d777f25 Set RBE_DIR default value to point to prebuilts in tree.
The new default points to prebuilts/remoteexecution-client/live.

Also sets the default exec strategy of Javac/R8/D8 to remote local
fallback.

Test: simple one action build
Change-Id: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
2020-08-13 11:49:30 -04:00
Yo Chiang
828d46fbbe Bypass missing required module check on ASAN SANITIZE_TARGET build
ASAN SANITIZE_TARGET build may have missing dependencies due to
executables being skipped, thus bypass the required module check.
https://source.android.com/devices/tech/debug/asan#sanitize_target

Also streamline the bypassing logic.

Fix: 163802658
Test: TH
Test: lunch aosp_cf_x86_pasan-userdebug &&
  m SANITIZE_TARGET=address nothing
Change-Id: Ia43c942ce7eae718bf6fcd254307535e418a70e7
2020-08-13 12:45:52 +08:00
Treehugger Robot
36ca2ea54f Merge "Use the soong-built NDK CRT objects." am: 14350c575f am: 4b539172c1
Original change: https://android-review.googlesource.com/c/platform/build/+/1365604

Change-Id: I4389daa518ff3d329a2317c8045bd77eb2bd0eea
2020-08-12 22:33:47 +00:00
Treehugger Robot
14350c575f Merge "Use the soong-built NDK CRT objects." 2020-08-12 22:01:27 +00:00
Paul Scovanner
5eec497aa4 Update Security String to 2020-10-05
Bug: 163542576
Change-Id: Id3cbd4d6528f827eba6ac410ba2eb92d91d40901
2020-08-12 19:01:02 +00:00
Kousik Kumar
855890f873 Merge "Remove double quotes in rbe.mk file" am: 08dcccb16a am: fe33530a8a
Original change: https://android-review.googlesource.com/c/platform/build/+/1397848

Change-Id: I54357bd0272fd75aca48d5ea3e3310bce6687b20
2020-08-12 18:37:54 +00:00
Treehugger Robot
5de2b2fd65 Merge "Package the JDK into test suite zips" am: 682aa6879a am: 1be828f466
Original change: https://android-review.googlesource.com/c/platform/build/+/1118180

Change-Id: Ib827ad14511ceb66c271f0eeec7cfa50a3d0c297
2020-08-12 18:37:37 +00:00
Kousik Kumar
08dcccb16a Merge "Remove double quotes in rbe.mk file" 2020-08-12 18:16:32 +00:00
TreeHugger Robot
0b26cdff47 Merge "Update Security String to 2020-10-01" into rvc-dev am: 2cda207786
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12352070

Change-Id: I4d469fb5e47651ec943eed5a8ac8ff00bea60b76
2020-08-12 18:10:44 +00:00