Commit graph

60125 commits

Author SHA1 Message Date
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
Jaewoong Jung
851b30ec32 Mark android_app_set modules PRESIGNED. am: 077891d190
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I0d6deda10dde3697ffb61792cd17c6e16d7ed8e3
2020-06-26 03:49:22 +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
Tianjie Xu
ea764307de Merge "Add lz4 to otatools" into rvc-dev am: c35ea185b0 am: d38eafeb9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11992672

Change-Id: I1367aab07fab43d1e8a2d05a7e536f18cecaa13f
2020-06-25 02:56:21 +00:00
Tianjie Xu
d38eafeb9e Merge "Add lz4 to otatools" into rvc-dev am: c35ea185b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11992672

Change-Id: I63c59cb95f3e93c04c151d0d16940dca852aefdf
2020-06-25 02:39:20 +00:00
Tianjie Xu
c35ea185b0 Merge "Add lz4 to otatools" into rvc-dev 2020-06-25 02:25:02 +00:00
TreeHugger Robot
b8bbb0ee7e Merge "Use inclusive language in build/make part 2" into rvc-dev am: b6d0be942a am: 5d995f06c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11991738

Change-Id: Ia4b72a14189ea8a45d80ebb1ca5881284ae2e595
2020-06-25 01:56:03 +00:00
TreeHugger Robot
5d995f06c2 Merge "Use inclusive language in build/make part 2" into rvc-dev am: b6d0be942a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11991738

Change-Id: I3b9f833d96fc86da5141b4e5e0d0bf9898303e87
2020-06-25 01:41:57 +00:00
TreeHugger Robot
b6d0be942a Merge "Use inclusive language in build/make part 2" into rvc-dev 2020-06-25 01:20:16 +00:00
Tianjie
e6369cec6b Add lz4 to otatools
A call to lz4 was added in http://go/aog/1329115. But the binary
isn't added to otatools, leading to a signing failure.

Bug: 159656873
Test: build otatools
Change-Id: I9cab00f36ce3c39cc174b4c9feffdf360f0364ef
(cherry picked from commit 3031c29905)
2020-06-24 16:50:18 -07:00
Colin Cross
74c7561dcc Use inclusive language in build/make part 2
Test: m checkbuild
Bug: 158889297
Change-Id: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
Merged-In: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
(cherry picked from commit d1cbfeaa3a)
2020-06-24 15:00:05 -07:00
TreeHugger Robot
0fb4465e69 Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 am: bd4f94ecd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I9b1c8ff35538d70738d488125859ed78301d5b0f
2020-06-23 20:48:51 +00:00
TreeHugger Robot
bd4f94ecd9 Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I8bafa1ed61f54f782a8f1195f89e275c632cc8ef
2020-06-23 20:33:23 +00:00
TreeHugger Robot
30d5c93f47 Merge "Switch to using llvm-strip for modules" into rvc-dev 2020-06-23 20:17:52 +00:00
Jooyung Han
b561831f12 Merge "GSI: install flattened cts shim" into rvc-dev am: cd1aaed4f0 am: 80fa750236
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910091

Change-Id: I9b910780c114e4242dd5d940b7f989d0134a29f3
2020-06-22 17:34:59 +00:00
Jooyung Han
80fa750236 Merge "GSI: install flattened cts shim" into rvc-dev am: cd1aaed4f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910091

Change-Id: I1a460d80415f045a73e164e3dd14dfb5c7d002c4
2020-06-22 17:20:49 +00:00
Jooyung Han
cd1aaed4f0 Merge "GSI: install flattened cts shim" into rvc-dev 2020-06-22 17:05:58 +00:00
J. Avila
74d50ccb69 Switch to using llvm-strip for modules
The gcc tools are deprecated; replace with the llvm equivalent.

Bug: 158484106
Merged-In: I9c3717bde281667eec82cc21dc63dc7fd5592a46
Change-Id: I9c3717bde281667eec82cc21dc63dc7fd5592a46
2020-06-22 15:31:27 +00:00
Jooyung Han
15f9085595 GSI: install flattened cts shim
The flattened version of com.android.apex.cts.shim.v1 should be
explicitly installed because the shim apex is prebuilt one and
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not supported for
prebuilt_apex modules yet.

Bug: 158169437
Bug: 159392784
Test: m com.android.apex.cts.shim.v1_with_prebuilts.flattened
      # should install the prebuilts of shim APKs
Change-Id: I8b37a320d2130d7b33aca856bc067dce37d1fb30
2020-06-19 20:09:06 +09:00
Chen Xu
b92a8b0237 Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev am: 99e317ce2d am: 3af5f639bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002

Change-Id: Id19122df28a1ddf74e84506ff3c744526c500af6
2020-06-19 06:18:25 +00:00
Chen Xu
3af5f639bb Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev am: 99e317ce2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002

Change-Id: I47f22a1465bc6a4b89d376d151e1fdfcd58f17b5
2020-06-19 06:00:06 +00:00
Chen Xu
99e317ce2d Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev 2020-06-19 05:49:39 +00:00
TreeHugger Robot
5e074117fd Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88 am: 7f78fbe044
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072

Change-Id: I71275d2ed20368ebb90aa98245aae8240a367cdb
2020-06-19 03:59:06 +00:00
TreeHugger Robot
7f78fbe044 Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072

Change-Id: I72a9b35421440dbe4d38e09b01bb8a2f76618803
2020-06-19 03:41:35 +00:00
TreeHugger Robot
b8f8fc6a88 Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev 2020-06-19 03:20:24 +00:00
TreeHugger Robot
7bf4d709ee Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885 am: a47ca3bb29
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080

Change-Id: I767e6fa1f6255f4d5b0280e98f061a14e78c6d9d
2020-06-19 01:58:22 +00:00
TreeHugger Robot
a47ca3bb29 Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080

Change-Id: I9b88e5dbecd5a140058570640bfcdaf2138b7fdc
2020-06-19 01:40:30 +00:00
TreeHugger Robot
22f98f1885 Merge "notice files in system_other becomes included in system's one" into rvc-dev 2020-06-19 01:23:26 +00:00