Commit Graph

26184 Commits

Author SHA1 Message Date
Treehugger Robot
442ec920ba Merge "Add bootloader to droidcore if built" am: c73b31bf2a am: 6cea038dfe
Original change: https://android-review.googlesource.com/c/platform/build/+/1416388

Change-Id: Ib1d4e8e1fad3edd10be9d0856a79d4f4d2b413ab
2020-09-01 01:28:03 +00:00
Colin Cross
6af7cbe855 Fix BOARD_PREBUILT_(VENDOR|ODM)_DLKMIMAGE support in target-files.zip
BOARD_PREBUILT_ODM_DLKMIMAGE support seems to have been forgotten
in target-files.zip, and BOARD_PREBUILT_ODM_DLKMIMAGE support had
a typeo.

Test: treehugger
Change-Id: I9663220b43f0df4f39a7ef432ad4cfec39803a20
2020-09-01 01:26:50 +00:00
Colin Cross
a6de2ada15 Fix incorrect conditional comment in target-files.zip rule
Test: none
Change-Id: I15ced0acc9cf6f56c5094bb8e5aaa3957a9648cb
2020-09-01 01:26:33 +00:00
Martin Stjernholm
49a4e9b52e Preserve symlinks in the Soong prebuilt install steps for host binaries
and shared libs.

If a prebuilt module file is a symlink in the .intermediates tree it is
preserved when copied to the final install location. This preserves
symlinks to prebuilt binaries, so that they are run from their prebuilt
source location and can find libraries in relative paths from there.

Symlinks are converted to absolute, to not fail if they are relative in
the source tree.

Test: m clean && m droid dist checkbuild
  with and without the change, then compare the lists of symlinks in
  the out/ trees
Test: build/soong/soong_ui.bash --make-mode \
    TARGET_PRODUCT=crosshatch_hwasan TARGET_BUILD_VARIANT=userdebug \
    droid SANITIZE_TARGET=hwaddress \
    continuous_instrumentation_tests_api_coverage \
    continuous_native_tests device-tests platform_tests
  check that libclang_rt.hwasan_static-aarch64-android.a isn't a
  symlink in out/target/product/crosshatch/obj
Bug: 145934348
Change-Id: I7600e5b0754f8ea6cd0ffc8e1ba6d39153f182aa
2020-09-01 00:24:54 +01:00
android-build-team Robot
7a2d6ae91e Make change and version bump to RQ1A.200901.001
Change-Id: I8e90c98cd4603037ee8fd7aa03f95b64b17414c6
2020-08-31 23:16:15 +00:00
Ram Muthiah
9fe40ca37b Add bootloader to droidcore if built
Non-dist builds don't copy out the bootloader.
This change fixes that.

Bug: 167160541
Bug: 164917252
Test: local build
Change-Id: I9bab9ba3455e8abee9e7a38bff431a142e7d5a57
2020-08-31 19:31:50 +00:00
Kousik Kumar
136274bfaa [DO NOT MERGE] Update configuration for RemoteExecution actions
1. Specify addition inputs needed for R8 / D8 / Javac actions so that
they can be successfully executed remotely.
2. Cleanup platform configuration so that pool-names are turned into a
common variable and re-used between javac / r8 / d8 actions.

Bug: b/152273259
Change-Id: I0231a96f6e4e094e98d0f89728f6ac3e34f78118
Merged-In: I0231a96f6e4e094e98d0f89728f6ac3e34f78118
2020-08-31 12:37:54 +00:00
Ramy Medhat
0ba998c376 [DO NOT MERGE] Modify D8 template to not have inputs under the output directory.
Test: presubmit
Bug: b/166182389
Change-Id: I800664acdeffa04ce83a8446bece411f018af2e2
Merged-In: I800664acdeffa04ce83a8446bece411f018af2e2
2020-08-31 12:37:30 +00:00
Kousik Kumar
8b3850d8e5 [DO NOT MERGE] Add exec_strategy as CLI flags to all rewrapper commands
Bug: b/148798195
Test: The same change is live in master-build-rbe-testing branch where
its not causing any behavior change, and also it works for
RemoteExecution where RBE_CXX_EXEC_STRATEGY variable is set.

Bug: b/166182389
Change-Id: I5efb1c2ab74dbe70dd70bf43d6262f2063d4d378
Merged-In: I745ed4a91c2b070048c0b1fd0881e5f4f28d0148
2020-08-31 12:36:29 +00:00
Ramy Medhat
c9a030aa4d [DO NOT MERGE] Add RBE support for Javac, R8, and D8 if respective env vars are set.
Bug: b/166182389
Test: aosp_crosshatch build with and without the new variables.
Change-Id: I252ff5dd8e372edf8c86e25348c8a2bfab41d70d
Merged-In: I252ff5dd8e372edf8c86e25348c8a2bfab41d70d
2020-08-31 12:36:21 +00:00
Ramy Medhat
77a4879e8c [DO NOT MERGE] Add PWD to environment variable whitelist for RBE builds.
Test: Build aosp with USE_RBE=1.
Bug: b/166182389
Change-Id: I4b51fbde330c6129654aa74f8a58dccf62cfa11d
Merged-In: I4b51fbde330c6129654aa74f8a58dccf62cfa11d
2020-08-31 12:35:52 +00:00
Ramy Medhat
f965526697 [DO NOT MERGE] Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links.
Test: Built aosp-arm64_eng with and without USE_RBE=1

Bug: b/166182389
Change-Id: I8d04069219a9467c3de9a028eb68e3115173f1e2
Merged-In: I8d04069219a9467c3de9a028eb68e3115173f1e2
2020-08-31 12:35:23 +00:00
Ramy Medhat
7298be1b47 [DO NOT MERGE] Add RBE mk file to support bootstrapping RBE and setting relevant
environment variables.

Test: Built aosp_arm-user with and without USE_RBE. With USE_RBE,
used a simple proxy script in place of rewrapper.

Bug: b/166182389
Change-Id: Ifb6bfd9f7292346f4750a6a409aa0def4e3c0363
Merged-In: Ifb6bfd9f7292346f4750a6a409aa0def4e3c0363
2020-08-31 12:34:55 +00:00
Colin Cross
772817c911 Merge "Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true" am: 8b21e4e7d4 am: 3a6e1ec965
Original change: https://android-review.googlesource.com/c/platform/build/+/1414693

Change-Id: I9dd7764bf312dbb77ec9b987bc68fc1fd423d2e4
2020-08-31 05:21:46 +00:00
Colin Cross
8b21e4e7d4 Merge "Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true" 2020-08-31 04:20:18 +00:00
android-build-team Robot
d0838c32d0 Make change and version bump to RQ1A.200831.001
Change-Id: I476d372d543f3daa0e1a1d494692cc861a2a0a59
2020-08-30 21:16:55 +00:00
android-build-team Robot
df7acd18c1 Make change and version bump to RQ1A.200830.001
Change-Id: Iaab3b8f27ad9615ea3ea540ca8e4a49335df2e0c
2020-08-29 21:15:49 +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
android-build-team Robot
b13bb9e89c Make change and version bump to RQ1A.200829.001
Change-Id: I026144ef33a88568b4d0a45338345312626fe5c6
2020-08-28 23:19:47 +00: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
android-build-team Robot
b504d3e5bb Make change and version bump to RQ1A.200828.001
Change-Id: I89d673891d6f6132a0cb1801931b2a74a0831291
2020-08-27 23:16:13 +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
android-build-team Robot
42cb96b2d5 Make change and version bump to RQ1A.200827.001
Change-Id: I4677c11117651fdeeedb5c97cd4c560e16559b8a
2020-08-26 23:16:18 +00: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
android-build-team Robot
25a7d8975f Make change and version bump to RQ1A.200826.001
Change-Id: Ia55c0bb38bd0dc02733cfacc6593f30081f30816
2020-08-25 23:16:42 +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
android-build-team Robot
1ce5d32dd9 Make change and version bump to RQ1A.200825.001
Change-Id: I53b0b3a391bab06fca6325546376a8d595c1c2bf
2020-08-24 23:16:29 +00:00
android-build-team Robot
41baedd211 Version bump to RP1A.201005.005 [core/build_id.mk]
Change-Id: I8493094fd6de2110bcf78c61db2d74f361e9cd03
2020-08-24 21:17:34 +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
android-build-team Robot
b5d6f9e831 Make change and version bump to RQ1A.200824.001
Change-Id: Ibb7d14d42abb2fb4a1b5e8abdfae7844e0383575
2020-08-23 21:16:03 +00:00
android-build-team Robot
7814ff3af3 Make change and version bump to RQ1A.200823.001
Change-Id: I8644296be11978088cb13fe77707c49c1e452c62
2020-08-22 21:16:17 +00: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
android-build-team Robot
5c4da3eaf3 Make change and version bump to RQ1A.200822.001
Change-Id: I6976be6b4d23dbadb8c952650e742fe46bd74bf5
2020-08-21 23:16:43 +00:00
android-build-team Robot
aa462ee010 Version bump to RP1A.201005.004 [core/build_id.mk]
Change-Id: I3eb7863f2e30910df11b91665df339ff8d684f2b
2020-08-21 19:07:11 +00:00