Commit graph

23420 commits

Author SHA1 Message Date
Paul Scovanner
f5139e3087 Update Security String to 2021-08-05
Bug: 191053489
Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 18:53:26 +00:00
Paul Scovanner
64b00db8f4 Update Security String to 2021-07-05
Bug: 188458861
Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
2021-05-17 21:54:30 +00:00
Paul Scovanner
deaeaecae3 Update Security String to 2021-06-05
Bug: 185154903
Change-Id: Ibfaf0bcc7e4525786eca62cafc7548030be40c61
2021-04-12 21:03:24 +00:00
Paul Scovanner
321db2f846 DO NOT MERGE
Update Security String to 2021-05-05

Bug: 182937985
Change-Id: Ica626a3b19e5b642807234c288428cd7e0f40f98
2021-03-17 20:26:59 +00:00
Paul Scovanner
9c4665257c Update Security String to 2021-03-05
Bug: 177091143
Change-Id: I6d6542306c51ac1682f02cbce6701688d2bdbea2
2021-01-08 21:53:54 +00:00
Paul Scovanner
d4d46ab023 Update Security String to 2021-02-05
Bug: 175313938
Change-Id: I6a1139d288c24a11289fc53c9022fd6d70acd8e6
2020-12-10 18:23:46 +00:00
Paul Scovanner
643b264940 Update Security String to 2021-01-05
Bug: 173545603
Change-Id: I273073a04d6981c5a58b3aebdf13249fdb46586e
2020-11-17 23:14:24 +00:00
Paul Scovanner
29d48ffac5 Update Security String to 2020-12-05
Bug: 170492812
Change-Id: I61eac7915ab4b23227c3263d3f33a0f71dc3a107
2020-10-12 22:01:11 +00:00
Kousik Kumar
602859b186 resolve merge conflicts of a7beb10933 to rvc-dev
Bug: b/167405184
Change-Id: Ib35af2813e7b60932df33f905d8e0398727ee545
Merged-In: I4d06b4fa190d6185b15aa98cb6f1a33f9702981e
2020-09-23 04:40:24 -04:00
Kousik Kumar
63e1c37e6f resolve merge conflicts of 22ccf36b1b to rvc-dev
Bug: b/167405184
Change-Id: Ide73513d5822670eeb16e6b4a4332d1dc77567de
Merged-In: Ic8a8adb3fffb357754384ddbf13684d944a9767e
2020-09-22 17:58:24 +00:00
Paul Scovanner
00d4c092a5 Update Security String to 2020-11-05
Bug: 168709737
Change-Id: I981139f21fb2ffcc9688aad02839a81ce6de6f5f
2020-09-18 20:32:40 +00:00
Kousik Kumar
a7beb10933 Rename wlist to allowlist am: 73bcc38ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12618003

Change-Id: I572802bb8209565cfacd800f93242123b51c2354
2020-09-17 15:03:52 +00:00
Kousik Kumar
22ccf36b1b Merge changes Ic8a8adb3,Ia972c74d into qt-dev am: 94bf36bd92
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599825

Change-Id: I3ee84b49cdaffcbc1f1ebae1e55e34aa08b5e8e8
2020-09-16 19:16:57 +00:00
Kousik Kumar
7de98747f4 Add RBE_CXX_COMPARE variable to locally disable compare mode for C++ am: 0118dd2f83
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12599824

Change-Id: I88fc811658a05340c8c16f16bcb388f5f8aba9d5
2020-09-16 19:16:55 +00:00
Paul Scovanner
727715f100 Update Security String to 2020-11-01
Bug: 168709737
Change-Id: I96489891caa4f5248c90be2d8c16327e1991e3bb
2020-09-16 19:16:48 +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
Ramy Medhat
32b7584983 [DO NOT MERGE] Set RBE_DIR default value to point to prebuilts in tree. am: 83c95dea63
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12593960

Change-Id: I3ea1bb99d0cd40b210f51665e48cf65d5eb7d315
2020-09-16 07:10:50 +00:00
TreeHugger Robot
461c0d4620 Merge "Set RBE_DIR default value to point to prebuilts in tree." into rvc-dev 2020-09-15 23:30:18 +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
f65ffea114 Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" into rvc-dev 2020-09-14 14:25:29 +00:00
Kousik Kumar
97a8b0429a [DO NOT MERGE] Update configuration for RemoteExecution actions am: 136274bfaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468477

Change-Id: I3433f0d3e24302f14c5fe317b3e49a6497572807
2020-09-02 11:39:39 +00:00
Ramy Medhat
a3933f760e [DO NOT MERGE] Modify D8 template to not have inputs under the output directory. am: 0ba998c376
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468476

Change-Id: I7f218170ca51b9d7e40394cb5a91e31ea0ab26d9
2020-09-02 10:56:06 +00:00
Kousik Kumar
fc82cb6c31 [DO NOT MERGE] Add exec_strategy as CLI flags to all rewrapper commands am: 8b3850d8e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468475

Change-Id: Ibd494a5572372aa6513571dcab90012803b3157f
2020-09-02 10:55:58 +00:00
Ramy Medhat
5507116c4a [DO NOT MERGE] Add RBE support for Javac, R8, and D8 if respective env vars are set. am: c9a030aa4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468474

Change-Id: I4c8226d15b6dd6676b57e4c7c4295b294903cb06
2020-09-02 10:55:51 +00:00
Ramy Medhat
1700189171 [DO NOT MERGE] Add PWD to environment variable whitelist for RBE builds. am: 77a4879e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468473

Change-Id: I430d3db12a0c7a2bfac2d5e08ca33fb3bfd74580
2020-09-02 10:55:44 +00:00
Ramy Medhat
d0c6aa3e33 [DO NOT MERGE] Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links. am: f965526697
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468472

Change-Id: I0b6627f74ffac2e170d0fa83f9c2952e25e92524
2020-09-02 10:55:38 +00:00
Ramy Medhat
edd7e730e3 [DO NOT MERGE] Add RBE mk file to support bootstrapping RBE and setting relevant am: 7298be1b47
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12468471

Change-Id: Ib71a27f068c500b3408198cd8731fd6fddbe577c
2020-09-02 09:10:39 +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
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
5eec497aa4 Update Security String to 2020-10-05
Bug: 163542576
Change-Id: Id3cbd4d6528f827eba6ac410ba2eb92d91d40901
2020-08-12 19:01:02 +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
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
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
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
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
Colin Cross
89cf3cf572 Merge "Install symbols for JNI libraries" into rvc-dev 2020-07-17 22:16:01 +00:00
Colin Cross
8d2183f461 Install symbols for JNI libraries
When building an app in Soong with JNI libraries copy the unstripped
libraries to the symbols directory in directory that matches the
installed path of the APK.

Bug: 159726429
Test: forrest
Change-Id: If8e423c7cdf3afd518761b5ab6bc857321acda46
Merged-In: If8e423c7cdf3afd518761b5ab6bc857321acda46
(cherry picked from commit e926cab372)
2020-07-17 19:10:46 +00:00
Colin Cross
1db45ef2a2 Dist lint reports for apps
Dist the transitive lint report for each unbundled app built by Soong
when lint-check is on the command line.

Bug: 153485543
Test: m TARGET_BUILD_APPS=Gallery2 lint-check dist
Change-Id: Icd2b6f884396fa5f743746099301c325ca82a324
Merged-In: Icd2b6f884396fa5f743746099301c325ca82a324
(cherry picked from commit b842952421)
2020-07-16 16:20:20 -07:00
Paul Scovanner
b751b77548 Update Security String to 2020-09-05
Bug: 160158282
Change-Id: Ia207cf01e57df8539fbbbaf6e042bd610aa64956
2020-07-14 17:07:25 +00:00