Commit graph

52501 commits

Author SHA1 Message Date
Paul Scovanner
0f0c87eab7 Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: Iab2faef2dcaaba49ff479003b35d5d9ff703c9b1
2020-11-18 23:34:54 +00:00
Paul Scovanner
cc0c1b00b6 Update Security String to 2021-01-01 am: 6441bc7ca3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: I489da5f003acbd32d027cb512c7343e83a9dc144
2020-11-18 23:17:46 +00:00
Paul Scovanner
6441bc7ca3 Update Security String to 2021-01-01
Bug: 173545603
Change-Id: If6e59e48439ca692650a6ad7ad23535a8576a585
Merged-In: I273073a04d6981c5a58b3aebdf13249fdb46586e
2020-11-18 01:39:12 +00:00
Paul Scovanner
9d2b3fa3a5 Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f am: c4c139cf8a am: f96ad85d9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: I16f861d8048287888e73e72e6eb0e4f82f8e07ea
2020-11-05 04:25:35 +00:00
Paul Scovanner
7490ed5cee Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e am: ee7f20037f am: fad16b3034
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: Ic26af0bc48dd5676ad2794690b3d5c305231d048
2020-11-05 04:25:19 +00:00
TreeHugger Robot
47ba91cd62 Merge "Update Security String to 2020-10-01 am: d9b732a0cb Bug: 163542576" into qt-dev 2020-11-05 04:22:12 +00:00
Paul Scovanner
dc19f1bf71 Update Security String to 2020-10-01 am: d9b732a0cb
Bug: 163542576

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

Change-Id: Ifc1e613c58f384f9b271d65ee471a62b391fdfcc
Merged-In: I4973247ab66704c16446c47c6fd830a21ea2504f
2020-11-04 22:36:47 +00:00
Paul Scovanner
f96ad85d9d Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f am: c4c139cf8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: I3b01efd99ab7cb553221e604592a54f39d7b6fe1
2020-10-14 23:24:45 +00:00
Paul Scovanner
c4c139cf8a Update Security String to 2020-12-01 am: bfe242def7 am: 72b39fb85f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: I49077857f43cc753df4277507679bb5911646251
2020-10-14 22:57:49 +00:00
Paul Scovanner
72b39fb85f Update Security String to 2020-12-01 am: bfe242def7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804958

Change-Id: Ibf919a022268e0a30f0cc3b53a248279751656a5
2020-10-14 22:34:50 +00:00
Paul Scovanner
bfe242def7 Update Security String to 2020-12-01
Bug: 170492812
Change-Id: I591ddb5212425bed73ed3b03e392d4c79850e602
Merged-In: I61eac7915ab4b23227c3263d3f33a0f71dc3a107
2020-10-13 21:20:09 +00:00
Paul Scovanner
fad16b3034 Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e am: ee7f20037f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: I539881c4337fa78cdead3b5fc1229afe1f535603
2020-09-17 20:37:37 +00:00
Paul Scovanner
ee7f20037f Update Security String to 2020-11-01 am: efacba8eef am: ec316d384e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: I1c1450cb56abd65483da13a2d3cf89967ab1e860
2020-09-17 19:43:12 +00:00
Paul Scovanner
ec316d384e Update Security String to 2020-11-01 am: efacba8eef
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12617844

Change-Id: I4fca4c04dedc5cd8e9bb6f2b7bed3b5e2797563e
2020-09-17 19:15:37 +00:00
Paul Scovanner
efacba8eef Update Security String to 2020-11-01
Bug: 168709737
Merged-In: I96489891caa4f5248c90be2d8c16327e1991e3bb
Change-Id: I2ec81773c28b4ad2e74b600dbf1bfd2503b085ea
2020-09-16 19:17:30 +00:00
Kousik Kumar
73bcc38ac8 Rename wlist to allowlist
The new release of re-client renames env_var_wlist to env_var_allowlist.
We need to make this change as part of the topic so that with the new
release we are able to deprecate this variable.

Bug: b/167677318
Change-Id: I988381f4f72061f7c6eb99d58593f92cfd618b1b
Merged-In: I988381f4f72061f7c6eb99d58593f92cfd618b1b
2020-09-16 18:20:29 +00:00
Kousik Kumar
94bf36bd92 Merge changes Ic8a8adb3,Ia972c74d into qt-dev
* changes:
  Remove double quotes in rbe.mk file
  Add RBE_CXX_COMPARE variable to locally disable compare mode for C++
2020-09-16 17:49:34 +00:00
Kousik Kumar
d9cf148ddb Merge "[DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree." into qt-dev 2020-09-16 05:12:53 +00:00
Kousik Kumar
f037e1a969 Remove double quotes in rbe.mk file
These result in weird command line invocations when used with RBE.

Test: Ran an RBE build locally and made sure it still worked as expected
after the change.
Bug: b/163618332

Change-Id: Ic8a8adb3fffb357754384ddbf13684d944a9767e
Merged-In: Ic8a8adb3fffb357754384ddbf13684d944a9767e
2020-09-15 18:43:42 +00:00
Kousik Kumar
0118dd2f83 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
Merged-In: Ia972c74d804085196a7b6ec755af63042c6b3909
2020-09-15 18:35:32 +00:00
Ramy Medhat
83c95dea63 [DO NOT MERGE] 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.

Bug: b/166182389
Test: simple one action build
Change-Id: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
Merged-In: I3392a0f7ac6de818d0c5ba2e113fcb035c6fa0ae
2020-09-15 18:32:57 +00:00
Kousik Kumar
45abdb21af [DO NOT MERGE] Add rbesetup.sh script to Q branch
Bug: b/166182389
Merged-In: I2413a3648e9b2ff680cab6fededc07bbdd43378f
Change-Id: I2413a3648e9b2ff680cab6fededc07bbdd43378f
2020-09-14 07:18:34 +00:00
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
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
Sasha Smundak
eefa8e954e Implement android_app_set module.
Bug: 152319766
Test: manual and builtin
Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
Merged-In: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-06-03 09:50:48 -07:00
Kavi Gupta
3ed9021f87 Modify build to put dumpcoverage agent into /system/lib
This location allows the agent to be attached to arbitrary processes.

It only makes sense to include libdumpcoverage.so on coverage builds,
as these are the only builds that have any information to be dumped.

Bug: 148178774
Test: manual, used examples in README (see other CL) to test whether
it works on a userdebug_coverage build on cuttlefish

Change-Id: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda
Merged-In: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda
(cherry picked from commit 7185f8cc2d)
2020-02-03 19:07:26 +00:00
Pirama Arumuga Nainar
a21e8527a5 Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled.
libprofile-extras has a wrapper to getenv() that appends the effective
userid (euid) of the current process to GCOV_PREFIX.  This avoids
conflicts and permissions issues when multiple processes try to
create/access the same directories and files under /data/misc/trace.

This library needs to be added and the -Wl,--wrap,getenv flag needs to
be passed to all link steps.  Since Android.mk does not propagate flags
and libraries across dependencies, this change just adds the library and
flag to all non-static-library Android.mk modules.  As a consequence,
*ALL* binaries created via Android.mk will have the signal handler and
property watcher thread in libprofile-extras but they are no-ops in
non-coverage-enabled binaries.

The dependency is added early enough in core/binary.mk so that the
LOCAL_SOONG_LINK_TYPE resolutions occur correctly.

Bug: 148178774
Test: Verify that coverage files are written to
/data/misc/trace/<euid>/proc/... instead of /data/misc/trace/proc/...

Change-Id: I4d5f849c15e9a278253f2148185ddf3ab2878e2f
Merged-In: I4d5f849c15e9a278253f2148185ddf3ab2878e2f
(cherry picked from commit b8f898ef88)
2020-02-03 19:03:24 +00:00
Oliver Nguyen
71640a3296 Package coverage files as a zip.
Bug: 148178774
Test: make NATIVE_COVERAGE=true COVERAGE_PATHS="*"
Change-Id: I7ee9253ef47a502a9d29f7e15a4402cbb90e34ae
Merged-In: I7ee9253ef47a502a9d29f7e15a4402cbb90e34ae
(cherry picked from commit e91ab2397f)
2020-02-03 19:00:36 +00:00
Jerome Gaillard
7aa3039ef9 Allow files generated by droidstubs to be copied in the SDK
We need to get files generated by a droidstubs target into the SDK. So
we first copy them into the out/target/common/obj/PACKAGING folder where
they can be picked up by the SDK build.

Bug: 142480924
Test: m sdk
Change-Id: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
Merged-In: I7a0b22907603e1d17ac05901ee7f8bb9cff89f7f
2019-11-18 10:38:13 +00:00
TreeHugger Robot
5d0a024d7b Merge "Update OWNERS for version_defaults.mk with pscovanner & lubomir Bug: 141272605" into qt-dev 2019-10-16 17:58:38 +00:00
Adam Seaton
3b5bdbb68d Update OWNERS for version_defaults.mk with pscovanner & lubomir
Bug: 141272605
2019-09-20 21:51:11 +00:00
Lubo Hristov
73aa913b77 Update SPL to 2019-11-05
bug:141272605
2019-09-20 21:00:52 +00:00
Lubo Hristov
89b18c02ae Update SPL to 2019-11-01
bug:141272605
2019-09-19 19:54:07 +00:00
Baligh Uddin
39b8f9fc7d DO NOT MERGE - Add a guard against deleting AVB_PUBKey.
The avb_pubkey may not be present, if the apex was initially
unsigned or generated from a bundle.  In this case, running
sign_apex to generate a signed apex binary would result in an error.
This fix checks for presense of avbpubkey before attempting the
deletion

BUG: 139994107
Change-Id: I3cb2e88a11ad8797e38ba5fb98c96a4ec4135fc8
2019-08-25 22:20:36 -07:00
Paul Scovanner
e840881168 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-10-01
am: 3250cbd459 -s ours
am skip reason: subject contains skip directive

Change-Id: Icabb27f1fbad9a61104dd9a8421a5c87d1c18b64
2019-08-15 17:35:19 -07:00
Paul Scovanner
3250cbd459 [DO NOT MERGE] Update Security Strings to 2019-10-01
Bug:139434268
Change-Id: Ie9e36ac0ace5c67468391650ad2fa1fa02941f6e
2019-08-15 02:52:20 +00:00
Paul Scovanner
616d794540 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01
am: b88c9853aa -s ours
am skip reason: subject contains skip directive

Change-Id: I9454feb6965bf8a9e56342a3f8348d5933ece914
2019-08-14 19:24:52 -07:00
Paul Scovanner
b88c9853aa [DO NOT MERGE] Update Security Strings to 2019-09-01
Bug:139434268
Change-Id: I802a7aeb0c65240ff71f91506b8932bfa44090bc
2019-08-14 22:17:07 +00:00
Paul Scovanner
84633edb22 Update Security Strings to 2019-10-05
Bug:139434268
Change-Id: I063f0430347d9f1e6ea5a8133204585833ed5ddc
2019-08-14 21:11:01 +00:00