Commit graph

60295 commits

Author SHA1 Message Date
Paul Scovanner
d9b732a0cb Update Security String to 2020-10-01
Bug: 163542576
resolve merge conflicts of 8ee99c4fec to pi-dev

Change-Id: Ie984e76e3c9d76430f49fc6224bbfa968684dfc7
Merged-In: I4973247ab66704c16446c47c6fd830a21ea2504f
2020-09-01 16:27:04 +00:00
Paul Scovanner
8ee99c4fec Update Security String to 2020-10-01 am: d935b454f2 am: 9186e002dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12488862

Change-Id: I69c0bfea60816efd4fa1509a4bc1d06064d77611
2020-08-31 19:29:31 +00:00
Paul Scovanner
9186e002dc Update Security String to 2020-10-01 am: d935b454f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12488862

Change-Id: Ie383ac5500cea357422d0ba39e22d07813408ec3
2020-08-31 18:34:23 +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
Paul Scovanner
d935b454f2 Update Security String to 2020-10-01
Bug: 163542576
Change-Id: Ife0142d36bad0bb382f0743068812364cf04868f
Merged-In: I4973247ab66704c16446c47c6fd830a21ea2504f
2020-08-29 17:30:37 +00:00
Ramy Medhat
4d158b5f32 Add function to export default values for RBE related variables
Test: ran rbesetup.sh and small build after.
Bug: b/166273085
Change-Id: I429835f1bb6da75e2fcee7e9ddac6b11672121cd
Merged-In: I429835f1bb6da75e2fcee7e9ddac6b11672121cd
2020-08-25 17:51:30 +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
Paul Scovanner
419d70e8a6 Update Security String to 2020-10-05 am: 5eec497aa4 am: 8707038bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12362480

Change-Id: Ib1f4702e10ed635833f348ea5f01a9afca431f54
2020-08-13 20:00:20 +00:00
Paul Scovanner
8707038bff Update Security String to 2020-10-05 am: 5eec497aa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12362480

Change-Id: I11b20590f871a5c84238ba12817da12a2ca0cc39
2020-08-13 19:39:51 +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
TreeHugger Robot
21f2ab240f Merge "Update Security String to 2020-10-01" into rvc-dev am: 2cda207786 am: 1f7a940e75
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12352070

Change-Id: I707a8aa3fb4b6755bd9b0b0175bd6dbd30774871
2020-08-12 18:30:18 +00:00
TreeHugger Robot
1f7a940e75 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: I81ff138ba413eafee78d69e9b6015be405ff2d34
2020-08-12 18:10:39 +00:00
TreeHugger Robot
2cda207786 Merge "Update Security String to 2020-10-01" into rvc-dev 2020-08-12 17:53:28 +00:00
Jaewoong Jung
57d6a640ec [automerger skipped] Add LOCAL_APKCERTS_FILE support. am: 8f9d08a185 am: 081755c50a -s ours am: 38b4b2f059 -s ours am: 0a2ced9a14 -s ours
am skip reason: Change-Id I48183bc8cbf9dcc521f791812734205ed3f28f4c with SHA-1 29714ecda6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12277066

Change-Id: I32fc9bf32e872a4c039b631fa2a2ee252d1b1ac1
2020-08-12 05:27:00 +00:00
Jaewoong Jung
30e258cdda [automerger skipped] Mark android_app_set modules PRESIGNED. am: a6bcbd8a4a am: 699634b28d -s ours am: 54572e583b -s ours am: 452d5c6ac8 -s ours
am skip reason: Change-Id Ie83a05be0d71280644843eddffdbea6bcb429c74 with SHA-1 077891d190 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12275601

Change-Id: I94dd041a6e0ff532d135322126a82891c9bc527e
2020-08-12 05:26:59 +00:00
Jaewoong Jung
0a2ced9a14 [automerger skipped] Add LOCAL_APKCERTS_FILE support. am: 8f9d08a185 am: 081755c50a -s ours am: 38b4b2f059 -s ours
am skip reason: Change-Id I48183bc8cbf9dcc521f791812734205ed3f28f4c with SHA-1 29714ecda6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12277066

Change-Id: I5fd4811ab2ac5918ac6c0ed43bd2cb871cac22fe
2020-08-12 05:07:33 +00:00
Jaewoong Jung
452d5c6ac8 [automerger skipped] Mark android_app_set modules PRESIGNED. am: a6bcbd8a4a am: 699634b28d -s ours am: 54572e583b -s ours
am skip reason: Change-Id Ie83a05be0d71280644843eddffdbea6bcb429c74 with SHA-1 077891d190 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12275601

Change-Id: Idb12ad5e1a727ba568cd26c88976ba539e4d2257
2020-08-12 05:07:31 +00:00
Jaewoong Jung
38b4b2f059 [automerger skipped] Add LOCAL_APKCERTS_FILE support. am: 8f9d08a185 am: 081755c50a -s ours
am skip reason: Change-Id I48183bc8cbf9dcc521f791812734205ed3f28f4c with SHA-1 29714ecda6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12277066

Change-Id: Ib504855636fe597f3219fa8373651c491d96daf5
2020-08-12 04:42:09 +00:00
Jaewoong Jung
54572e583b [automerger skipped] Mark android_app_set modules PRESIGNED. am: a6bcbd8a4a am: 699634b28d -s ours
am skip reason: Change-Id Ie83a05be0d71280644843eddffdbea6bcb429c74 with SHA-1 077891d190 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12275601

Change-Id: I20e5e1921bc20dca603c855971f660d0f0e7bbc0
2020-08-12 04:42:05 +00:00
Jaewoong Jung
081755c50a Add LOCAL_APKCERTS_FILE support. am: 8f9d08a185
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12277066

Change-Id: I08c95fd6b5e82ce239549bf18827f870c677fc4d
2020-08-12 04:23:34 +00:00
Jaewoong Jung
699634b28d Mark android_app_set modules PRESIGNED. am: a6bcbd8a4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12275601

Change-Id: If0bcfa77b226d5ba1e1a3883106f5984042e93a9
2020-08-12 04:23:32 +00:00
Paul Scovanner
da6e4c1964 Update Security String to 2020-10-01
Bug: 163542576
Change-Id: I4973247ab66704c16446c47c6fd830a21ea2504f
2020-08-11 19:35:14 +00:00
Dan Willemsen
0aecdac89e Don't use the remote pool when using clang-tidy
In Make, clang-tidy and clang run in the same action, but only clang can
be remoted via RBE/GOMA. So to prevent running up to 500 clang-tidy
instances at the same time and overloading the machine, use the local
pool when using clang-tidy. This does limit the parallelism of the clang
actions attached to clang-tidy, but hopefully that's not that much of a
problem. Clang-tidy isn't enabled by default (opt-in per-build /
per-module), and Soong does not run into this problem.

Bug: 162615762
Test: m WITH_TIDY=1 nothing; build-aosp_flame.ninja is identical before/after
Test: use_rbe m WITH_TIDY=1; inspect build-aosp_flame.ninja, see local_pool
Change-Id: I7dd196fcf4183d175b9608d3d48cdcdf81b514ce
2020-08-05 20:23:24 -07:00
Roshan Pius
48825727f6 Revert "Revert "product: Remove wifi-service off SystemServerCla..."
Revert submission 10144846-revert-10103769-load_wifi_service_dynamically-XZNQJHXURR

Reason for revert: Changes in build system to store uncompressed and aligned DEX files for java libs in APEXes.

Reverted Changes:
Icc0b680c2: Revert "SystemServer: Dynamically load wifi-servic...
I83a2f93e3: Revert "product: Remove wifi-service off SystemSer...

Bug: 148099857
Bug: 162371380
Bug: 162746981
Test: build
Change-Id: Ia40bc9dec81347e205e5ff81d7b9045655fbe13a
2020-08-03 17:27:21 +00:00
Jaewoong Jung
8f9d08a185 Add LOCAL_APKCERTS_FILE support.
This is used when Soong and Make don't know the full output file list,
and so use a tool to generate a per-module apkcerts.txt file instead.

Bug: 160119159
Bug: 162464887
Test: m apkcerts-list
Merged-In: I48183bc8cbf9dcc521f791812734205ed3f28f4c
Change-Id: I48183bc8cbf9dcc521f791812734205ed3f28f4c
2020-07-30 17:43:32 -07:00
Jaewoong Jung
a6bcbd8a4a Mark android_app_set modules PRESIGNED.
Test: m apkcerts-list
Bug: 159921591
Bug: 162464887
Merged-In: Ie83a05be0d71280644843eddffdbea6bcb429c74
Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
2020-07-30 17:43:07 -07:00
wangzhou
d5055ebb5a Combine HOST/TARGET in Test Suite NOTICE. am: e73186d2ac am: 62bb7eecdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12204291

Change-Id: Ie51f9c1a357638efca5ce8d0e6bbc5adf43b725b
2020-07-23 04:45:12 +00:00
wangzhou
62bb7eecdf Combine HOST/TARGET in Test Suite NOTICE. am: e73186d2ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12204291

Change-Id: Ib44ed2520f01d9ec588413939e7f38430ce53e27
2020-07-23 04:29:17 +00:00
wangzhou
e73186d2ac Combine HOST/TARGET in Test Suite NOTICE.
This improved NOTICE bundling now includes TARGET_OUT deps that Android
Test Suites packages need, especially those for .apk files.

Bug: b/141258651
Test: $ make cts && \
        unzip -p out/host/linux-x86/cts/android-cts.zip \
        android-cts/NOTICE.txt \
        | less -N
Change-Id: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
2020-07-22 14:09:43 -07:00
Bob Badour
aa3cee98f0 Add support for combining the notices from 2 roots. am: 74a6a0a32a am: 8ccced3e81
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12204282

Change-Id: I7473dcfcbe0dfed16b31cda63d3044813f125e93
2020-07-22 00:46:44 +00:00
Bob Badour
8ccced3e81 Add support for combining the notices from 2 roots. am: 74a6a0a32a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12204282

Change-Id: I7bc8f5163314a558bdca2b37f42e67f7198ba43f
2020-07-22 00:29:00 +00:00
Bob Badour
74a6a0a32a Add support for combining the notices from 2 roots.
Apparently needed for cts tests due to apks putting intermediate files under
TARGET_OUT even when going to HOST_OUT.

Test: m with and without change verified no differences in notice files
Bug: 141258651

Change-Id: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
(cherry picked from commit 5e9e1fbe83)
Merged-In: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
2020-07-21 22:47:29 +00:00
Joe Wang
5790af2bd3 Merge "Build NOTICE txt file into TestSuite zip package." into rvc-dev am: 5486ee7365 am: b4bd99ac8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12189353

Change-Id: I2c746f451aa985880fd022a3c9002d2735b076ff
2020-07-21 18:29:24 +00:00
Joe Wang
b4bd99ac8d Merge "Build NOTICE txt file into TestSuite zip package." into rvc-dev am: 5486ee7365
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12189353

Change-Id: Iea77a7b5f95b3e09fd1d782889e0d6d8e24f322e
2020-07-21 18:11:00 +00:00
Joe Wang
5486ee7365 Merge "Build NOTICE txt file into TestSuite zip package." into rvc-dev 2020-07-21 17:44:10 +00:00
Jing Ji
18c0b79991 Merge "Remove a couple of LMK properties from GSI image" into rvc-dev am: 559d1769b6 am: 3d535f6bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12184946

Change-Id: I7a280c0af9b9a7b9c3b9132eafda499d984a4f58
2020-07-21 01:05:48 +00:00
Jing Ji
3d535f6bc0 Merge "Remove a couple of LMK properties from GSI image" into rvc-dev am: 559d1769b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12184946

Change-Id: I2c81ca92666d76c5557c83c12b54153eab791757
2020-07-21 00:47:52 +00:00
Jing Ji
559d1769b6 Merge "Remove a couple of LMK properties from GSI image" into rvc-dev 2020-07-21 00:26:41 +00:00
wangzhou
93d2fbbcad Build NOTICE txt file into TestSuite zip package.
- the NOTICE file is only taken from out/host.
- currently only enabled from cts by setting flag "test_suite_notice"

Test: $ make cts && unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
      $ make pts && \ unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
Bug: b/141258651
Change-Id: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
2020-07-20 23:41:23 +00:00
Jing Ji
5f97d6d24f Remove a couple of LMK properties from GSI image
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.

Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
Merged-In: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
2020-07-20 18:27:33 +00:00
TreeHugger Robot
2e3f0689a1 Merge "Use apksigner in check_target_files_signatures" into rvc-dev am: 0071b0b56d am: c621d9ebcd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12155560

Change-Id: I0fe34a5d967b95416ef513229ec5ef048d919feb
2020-07-17 23:41:19 +00:00
TreeHugger Robot
c621d9ebcd Merge "Use apksigner in check_target_files_signatures" into rvc-dev am: 0071b0b56d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12155560

Change-Id: I30146160cec29841336288e6d9824a80bc2ed93d
2020-07-17 23:22:29 +00:00
Colin Cross
70165e1e45 Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572 am: 9ec761171f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12181244

Change-Id: Icbb826079b5497f4e30dc79763997c79dbec16f9
2020-07-17 22:58:14 +00:00
TreeHugger Robot
0071b0b56d Merge "Use apksigner in check_target_files_signatures" into rvc-dev 2020-07-17 22:53:01 +00:00