Commit graph

59852 commits

Author SHA1 Message Date
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
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
5eec497aa4 Update Security String to 2020-10-05
Bug: 163542576
Change-Id: Id3cbd4d6528f827eba6ac410ba2eb92d91d40901
2020-08-12 19:01:02 +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
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
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
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
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
0071b0b56d Merge "Use apksigner in check_target_files_signatures" into rvc-dev 2020-07-17 22:53:01 +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
Tianjie
fb27b477d8 Use apksigner in check_target_files_signatures
Some apk files, e.g. Chrome.apk has switched to use v2+ scheme.
And the apk file no longer has a META-INF/CERT.RSA. So, the
signature parsing script should use apksigner to dump the cert
info.

Leave the parsing of META-INF/CERT.RSA as a fallback, as some apks
fail the `apksigner verify`. The script also switches to store the
digest of the cert instead of the raw bytes.

Bug: 157735036
Test: run check_target_files_signatures on aosp|signed target-files
(cherry picked from commit a9a50cf6e3)

Change-Id: I910cd1aa91d1e446bef7097871af4171c285685d
2020-07-14 21:48:48 -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
Colin Cross
5da1de831a Use unzip -DD
We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I6f08ba8695d90a8225cfc04e679755e6296deed0
Merged-In: I6f08ba8695d90a8225cfc04e679755e6296deed0
(cherry picked from commit c27d795b63)
2020-07-13 14:26:25 -07:00
Oliver Nguyen
e02730e29a Merge changes from topic "gcov-clang-migration" into rvc-dev
* changes:
  Rename Native_coverage to GcovCoverage in Soong
  Introduce product variables to select Java code coverage paths in Make.
  Rename native code coverage paths product variables in Make.
2020-07-06 21:07:54 +00:00
Anton Hansson
e6c24147f0 Remove vendor/... path checks DO NOT MERGE
The vendor path check is incompatible with the current setup of prebuilt
module stubs.

Bug: 160165426
Test: lunch mainline_system_x86 ; m nothing
Change-Id: I5aa809dc3e0c9b36e6963585bb60fd446a234022
2020-07-01 15:27:37 +01:00
Yifan Hong
2206bb29fd Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev 2020-07-01 01:38:10 +00:00
Jaewoong Jung
d1198b74b5 Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev 2020-07-01 00:06:23 +00:00
P.Adarsh Reddy
6924eb7d40 Fix up _CheckSecondTokenNotSlotSuffixed function.
Incremental OTA generation was failing since the
function _CheckSecondTokenNotSlotSuffixed was in
broken state, this change fixes the same.

Bug: 160215626
Test: Incremental OTA now gets generated and applied
      successfully a non-ab device.

Change-Id: Ifb3886396fe65dcdaeba16c568419b9fa084193d
(cherry picked from commit 52defe48d52a770c326f489357ab8877b211541e)
Merged-In: Ifb3886396fe65dcdaeba16c568419b9fa084193d
2020-06-30 14:49:04 -07:00
Paul Scovanner
21181c4726 Update Security String to 2020-09-01 am: dca1803d95
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12037363

Change-Id: Idd79854d376cefc22e20e7b440962ec9af993463
2020-06-30 03:37:48 +00:00
Jaewoong Jung
29714ecda6 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.

Fixes: 160119159
Test: m apkcerts-list
Change-Id: I48183bc8cbf9dcc521f791812734205ed3f28f4c
2020-06-29 19:47:21 -07:00
Colin Cross
b6ff8225b1 Rename Native_coverage to GcovCoverage in Soong
Pass the NATIVE_COVERAGE Make variable to Soong as the more accurate
GcovCoverage.  Also remove NATIVE_LINE_COVERAGE, it doesn't do anything
different from NATIVE_COVERAGE, and NATIVE_COVERAGE is always set when
NATIVE_LINE_COVERAGE is set.

Bug: 159059537
Test: m checkbuild
Merged-In: Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19
Change-Id: Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19
2020-06-29 18:01:40 -07:00
Roland Levillain
14323e5cf0 Introduce product variables to select Java code coverage paths in Make.
Introduce product variables `JavaCoveragePaths` and
`JavaCoverageExcludePaths` (resp. populated from environment variables
`JAVA_COVERAGE_PATHS` and `JAVA_COVERAGE_EXCLUDE_PATHS`). Use them to
control which Java modules are candidate for instrumentation based on
their source path. By default (when `JavaCoveragePaths` is empty),
have all Java modules be candidate for instrumentation, to preserve
the existing behavior.

Test: export EMMA_INSTRUMENT=true \
        && export EMMA_INSTRUMENT_FRAMEWORK=true \
        && export JAVA_COVERAGE_PATHS=art \
        && m
Bug: 158212027
Bug: 156284897
Merged-In: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9
Change-Id: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9
2020-06-29 18:01:25 -07:00
Roland Levillain
bdb1b4c79a Rename native code coverage paths product variables in Make.
Rename `CoveragePath` and `CoverageExcludePaths` as
`NativeCoveragePath` and `NativeCoverageExcludePaths` (resp.).
Also, populate `NativeCoveragePath` and `NativeCoverageExcludePaths`
from environment variables `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Bug: 158212027
Merged-In: I409dbb04b09744a7bd95a4b69361e858b9f89e23
Change-Id: I409dbb04b09744a7bd95a4b69361e858b9f89e23
(cherry picked from commit bad8b386e6)
2020-06-29 17:54:08 -07:00
Paul Scovanner
dca1803d95 Update Security String to 2020-09-01
Bug: 160158282
Change-Id: Ibf5c36e135398ed14a730d31fd1b5a306f7b9db3
2020-06-29 19:08:46 +00:00
SzuWei Lin
d7dabee7fe Merge "Rename the boot image for avb validation" into rvc-dev 2020-06-26 16:45:17 +00:00
Tianjie
8c2d9096e3 Rename the boot image for avb validation
Starting from http://go/aog/1328118, we chained the 1st GKI
boot image into vbmeta. However, this fails avb validation;
because the avbtool constructs the image path based by using
"partition name + ext".

This cl works around the issue by renaming boot-5.4.img to
boot.img, so avbtool can find the image correctly.

Bug: 159656873
Test: run validate target file
Change-Id: I577226596e139e5b5f3e6ca3c28ced02431ca392
Merged-Id: I577226596e139e5b5f3e6ca3c28ced02431ca392
(cherry picked from commit 5ec1a7a66a)
2020-06-26 16:44:14 +00:00
Jaewoong Jung
077891d190 Mark android_app_set modules PRESIGNED.
Test: m apkcerts-list
Fixes: 159921591
Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
2020-06-25 16:06:21 -07:00