Commit Graph

59888 Commits

Author SHA1 Message Date
Ramy Medhat 998ec8fa34 [automerger skipped] [DO NOT MERGE] Add RBE mk file to support bootstrapping RBE and setting relevant am: 7298be1b47 am: edd7e730e3 -s ours am: 428006cf4d -s ours
am skip reason: Change-Id Ifb6bfd9f7292346f4750a6a409aa0def4e3c0363 with SHA-1 ec8b8dfa3e is in history

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

Change-Id: I8fbf4b398486f432d88031e5a7834c9528d86ac0
2020-09-02 09:56:50 +00:00
Ramy Medhat 428006cf4d [automerger skipped] [DO NOT MERGE] Add RBE mk file to support bootstrapping RBE and setting relevant am: 7298be1b47 am: edd7e730e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied1f9813b9c799fa601af4d5bc3e9a19dc9baf1d
2020-09-02 09:27:23 +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
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 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 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 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
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 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 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 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 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 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
TreeHugger Robot 0071b0b56d Merge "Use apksigner in check_target_files_signatures" into rvc-dev 2020-07-17 22:53:01 +00:00
Colin Cross 9ec761171f Merge "Install symbols for JNI libraries" into rvc-dev am: 89cf3cf572
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12181244

Change-Id: I57d6deb6e23b2dc619bfcffd279be393a7e31a47
2020-07-17 22:43:07 +00:00
Colin Cross 89cf3cf572 Merge "Install symbols for JNI libraries" into rvc-dev 2020-07-17 22:16:01 +00:00
Colin Cross 805b0e7877 Dist lint reports for apps am: 1db45ef2a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12174648

Change-Id: Ieb4db0ff7eaa42c5fda497b3db0cc06bb5809e62
2020-07-17 20:54:06 +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 bb106a4008 Update Security String to 2020-09-05 am: b751b77548
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12150174

Change-Id: I7bbb9bc48b98fea9c6e58bb4795cdbd83113e1f2
2020-07-15 02:39:47 +00: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 21091fbeaa Use unzip -DD am: 5da1de831a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12142355

Change-Id: I3fa8a343c3a3277fc29671c1b22777d12a4c9528
2020-07-13 22:43:41 +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 5e47760ef3 Merge changes from topic "gcov-clang-migration" into rvc-dev am: e02730e29a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040351

Change-Id: I209d1f12d3b20df329c4878f568ece2ad7a92258
2020-07-06 21:47:40 +00:00
Roland Levillain 7d908254e7 Introduce product variables to select Java code coverage paths in Make. am: 14323e5cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040350

Change-Id: I48db793517afb14bd779722b10bb2dcc2db119ff
2020-07-06 21:47:38 +00:00
Roland Levillain 981feea925 Rename native code coverage paths product variables in Make. am: bdb1b4c79a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040349

Change-Id: I2d30e3459e228a9701a286925576ff4ef157a656
2020-07-06 21:47:36 +00: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 24b6156ffd Remove vendor/... path checks DO NOT MERGE am: e6c24147f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12050570

Change-Id: I0d2cc129132595a708ade71a1615ea8d0489c4dd
2020-07-02 09:32:10 +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 0d42f2f284 Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev am: 2206bb29fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12051901

Change-Id: Ie6365053a835b8f648ef76939a808848aed3390f
2020-07-01 01:48:11 +00:00
Yifan Hong 2206bb29fd Merge "Fix up _CheckSecondTokenNotSlotSuffixed function." into rvc-dev 2020-07-01 01:38:10 +00:00
Jaewoong Jung f296209f3a Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309

Change-Id: I066d94161b1569b7d4e8d774dbd2c39c3112ff0d
2020-07-01 00:23:44 +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