Commit graph

60202 commits

Author SHA1 Message Date
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
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
32bf4b8cac Dist lint reports for apps am: 1db45ef2a2 am: 805b0e7877
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12174648

Change-Id: I2095889591c593c93ab9cd2fe1a45ee5d54e6406
2020-07-17 21:10:40 +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
289c85a58f Update Security String to 2020-09-05 am: b751b77548 am: bb106a4008
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12150174

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

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

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

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

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

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

Change-Id: I40ce7637f6fca89f2e06420c3fc8be5bd5d00f6c
2020-07-01 02:03:09 +00: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
85b9e4eceb Merge "Add LOCAL_APKCERTS_FILE support." into rvc-dev am: d1198b74b5 am: f296209f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12039309

Change-Id: Ief76ed3733dd1da250968669f276a8e1134dbfb8
2020-07-01 00:38:05 +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
Paul Scovanner
a2ebd349fd Update Security String to 2020-09-01 am: dca1803d95 am: 21181c4726 am: 77802ebf89
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12037363

Change-Id: Id1f2d20abe4e098b045f77b971c7c6998f6e55cf
2020-06-30 04:08:29 +00:00
Paul Scovanner
77802ebf89 Update Security String to 2020-09-01 am: dca1803d95 am: 21181c4726
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12037363

Change-Id: I97e897b3353d260dacd1028f9b0503b8485738a0
2020-06-30 03:55:12 +00: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
07534d8362 Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: 9bac3d1c94
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I8fc99715a42a04e3c232be43cd598bf440daafda
2020-06-26 17:08:36 +00:00
SzuWei Lin
9bac3d1c94 Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I015e98609a6099671eed0bedafe01aab74eb12da
2020-06-26 16:54:47 +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
74395cf29d Mark android_app_set modules PRESIGNED. am: 077891d190 am: 851b30ec32
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I1968e4cc1d8763eb01971c283164594fad4717e8
2020-06-26 04:04:11 +00:00