Jimmy Chen
ed5adb9164
Merge "Fix soong_config handling of CompressedApex" am: 507e84a266
am: 44e5a6a9c6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675811
Change-Id: Ib0889803ce19054106ce9e8b6522204f5b86324c
2021-04-16 10:23:08 +00:00
Jimmy Chen
44e5a6a9c6
Merge "Fix soong_config handling of CompressedApex" am: 507e84a266
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675811
Change-Id: I4cbcdd07f2dcfd645d0a60ce8bae302fcc0ea53c
2021-04-16 09:55:46 +00:00
Jimmy Chen
507e84a266
Merge "Fix soong_config handling of CompressedApex"
2021-04-16 09:38:03 +00:00
Anton Hansson
106e11cfe7
Fix soong_config handling of CompressedApex
...
add_json_bool treats non-empty variable as "true" by default (which is
conventional in make). Fix treatment of PRODUCT_COMPRESSED_APEX to
support the value false.
Bug: 185537646
Test: OVERRIDE_PRODUCT_COMPRESSED_APEX=false m nothing && \
grep CompressedApex out/soong/soong.variables
Change-Id: I0562a375be377ab67a1d064e37aff5970c4ac8dd
2021-04-16 10:09:58 +01:00
Treehugger Robot
fb05047eab
Merge "Fix bug: repeated restricted effective conditions." am: b2233cf162
am: b06302ee80
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1677687
Change-Id: Iac8cb1c87f52b888310e97ef38302cf486ab0ed2
2021-04-15 22:57:01 +00:00
Treehugger Robot
b06302ee80
Merge "Fix bug: repeated restricted effective conditions." am: b2233cf162
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1677687
Change-Id: I25252c92e92a3ab54e008670856fb9bf3ed2b620
2021-04-15 22:31:08 +00:00
Treehugger Robot
b2233cf162
Merge "Fix bug: repeated restricted effective conditions."
2021-04-15 21:51:20 +00:00
Treehugger Robot
9a2ef432c1
Merge "Re-raise exceptions instead of sys.exit" am: c1817038f9
am: e9a711bc23
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1673906
Change-Id: I2aba3242c54cb43dfc00c9a32fd41d73bd4a3b1e
2021-04-15 20:24:29 +00:00
Treehugger Robot
e9a711bc23
Merge "Re-raise exceptions instead of sys.exit" am: c1817038f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1673906
Change-Id: I1be63b63eb12f34ce41d18ba741f086b3961cc7f
2021-04-15 19:44:16 +00:00
Treehugger Robot
c1817038f9
Merge "Re-raise exceptions instead of sys.exit"
2021-04-15 19:04:57 +00:00
Bob Badour
1f69c4404a
Fix bug: repeated restricted effective conditions.
...
Test: m all
Change-Id: I0fc8f66dd72e3d3983b9d2b5fa7416c09a776ccc
2021-04-15 10:59:40 -07:00
Jaewoong Jung
533b8d05b6
Merge "Add a missing dependency to the prebuilt app rule." am: 08eb6d9308
am: 4933028a4b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1673851
Change-Id: If09100eb39bf6040088f42f493fd8bb2a4225e9f
2021-04-15 17:09:05 +00:00
Nikita Ioffe
39b4cde442
Merge "Re-land "Enable apex compression on all devices with updatable apex" am: 9f539e2ec0
am: eee5a583fc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1671807
Change-Id: Ic245f2d001e286bac5db9c4e7155398fdbd6e7f3
2021-04-15 17:08:53 +00:00
Jaewoong Jung
4933028a4b
Merge "Add a missing dependency to the prebuilt app rule." am: 08eb6d9308
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1673851
Change-Id: Id1207eecd685f7a0ba146060dc65b92c18a0511f
2021-04-15 16:32:11 +00:00
Nikita Ioffe
eee5a583fc
Merge "Re-land "Enable apex compression on all devices with updatable apex" am: 9f539e2ec0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1671807
Change-Id: Ib7d399adece67103a99fb0c4b9d9cf8a72c8db6c
2021-04-15 16:29:17 +00:00
Jaewoong Jung
08eb6d9308
Merge "Add a missing dependency to the prebuilt app rule."
2021-04-15 16:07:40 +00:00
Nikita Ioffe
9f539e2ec0
Merge "Re-land "Enable apex compression on all devices with updatable apex"
2021-04-15 15:45:25 +00:00
Lucas Wei
3df934b8a8
Re-land "Enable apex compression on all devices with updatable apex
...
This reverts commit f8283a8bf6
.
Test: device boots
Test: OTA from uncompressed apexes to compressed apexes works
Bug: 169780183
Bug: 184746992
Bug: 185082717
Change-Id: I62e379f44a1dcf8ebd2b3448dc1381cd99427b45
2021-04-15 15:45:02 +00:00
Ulyana Trafimovich
a442d28d9e
Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." am: a43c4ff302
am: 497baa7fdc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1673313
Change-Id: I315eb53520023ab898e05e37901202bde940d0b2
2021-04-15 10:22:56 +00:00
Martin Stjernholm
c209ce3b1d
Merge "Add new user setup command banchan for module building." am: 7af86b16fc
am: 397d7f5c31
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1671570
Change-Id: I7f1b3e0cbea2db4753e3a43d000c2ab55ff2cef4
2021-04-15 10:22:51 +00:00
Ulyana Trafimovich
497baa7fdc
Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." am: a43c4ff302
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1673313
Change-Id: I176fa2a86b6132e13900ab76f20333bec8098554
2021-04-15 09:38:33 +00:00
Martin Stjernholm
397d7f5c31
Merge "Add new user setup command banchan for module building." am: 7af86b16fc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1671570
Change-Id: I3446cd1016f5cffa6db939be677adb3507543afe
2021-04-15 09:37:51 +00:00
Ulyana Trafimovich
a43c4ff302
Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES."
2021-04-15 08:23:34 +00:00
Martin Stjernholm
7af86b16fc
Merge "Add new user setup command banchan for module building."
2021-04-15 08:19:08 +00:00
Treehugger Robot
6cfc347cd5
Merge "Enable GKI 2.0 signing" am: 214382e048
am: d8d232e23f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1659680
Change-Id: I5aa8d7b10d40a09f35860313e18ffe5a1cd9ed62
2021-04-15 07:15:34 +00:00
Roman Kiryanov
3f988435a7
Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38
am: 56c9341ba1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1676586
Change-Id: I7a9333c02dcd5aa9f71cec21da5e2afc89d1ae2d
2021-04-15 07:15:15 +00:00
Treehugger Robot
d8d232e23f
Merge "Enable GKI 2.0 signing" am: 214382e048
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1659680
Change-Id: Ie3fac45b5b3ac38274cc983b0e7b07dfa4fc4312
2021-04-15 06:31:31 +00:00
Roman Kiryanov
56c9341ba1
Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1676586
Change-Id: I95338c4b55ce3352b4ef43c79871debc1bd9ed43
2021-04-15 06:30:50 +00:00
Treehugger Robot
214382e048
Merge "Enable GKI 2.0 signing"
2021-04-15 06:08:04 +00:00
Roman Kiryanov
ac46742e38
Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4"
2021-04-15 05:47:50 +00:00
Hunter Knepshield
69bb453792
Merge "Create a new certificate for 2021 CTS UICCs." am: bca0e63125
am: 548fb61cd6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1559795
Change-Id: Ib848bb740a70bf271e9459b3b77ede42597ccbc4
2021-04-15 05:21:39 +00:00
Yo Chiang
eed6d46645
Merge "Support building recovery as standalone ramdisk in vendor_boot v4" am: 1d1571e543
am: d1060db729
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1664082
Change-Id: I6a59c787498f762cc68a678a76c28b9e89ec40e4
2021-04-15 05:21:13 +00:00
Treehugger Robot
d0724a792a
Merge "Fix evaluation order of (Cfi|Memtag) exclude paths." am: 99802c7544
am: 32f54ff730
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1671971
Change-Id: If1adec82ce3c87242b5252faa69cb6702b876a7a
2021-04-15 05:21:00 +00:00
Hunter Knepshield
548fb61cd6
Merge "Create a new certificate for 2021 CTS UICCs." am: bca0e63125
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1559795
Change-Id: I2c612f2eaf55837219f99c339bb64972be8edec2
2021-04-15 04:43:38 +00:00
Yo Chiang
d1060db729
Merge "Support building recovery as standalone ramdisk in vendor_boot v4" am: 1d1571e543
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1664082
Change-Id: Ic383771336c02869ec0cd133e1663e2d2fa21bff
2021-04-15 04:43:26 +00:00
Treehugger Robot
32f54ff730
Merge "Fix evaluation order of (Cfi|Memtag) exclude paths." am: 99802c7544
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1671971
Change-Id: I3ad28fa43e01fb17a5c405b2513a57b479d03ffa
2021-04-15 04:42:26 +00:00
Hunter Knepshield
bca0e63125
Merge "Create a new certificate for 2021 CTS UICCs."
2021-04-15 04:18:27 +00:00
Yo Chiang
1d1571e543
Merge "Support building recovery as standalone ramdisk in vendor_boot v4"
2021-04-15 04:02:15 +00:00
Treehugger Robot
99802c7544
Merge "Fix evaluation order of (Cfi|Memtag) exclude paths."
2021-04-15 03:49:38 +00:00
Roman Kiryanov
0a2ef54d3b
Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4
...
required for androidboot
Bug: 182291166
Test: boot emulator
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib17f2ec6fb04eb8c7f592ec2a5d6cc886ad783c8
2021-04-14 18:18:08 -07:00
Mateusz Zięba
3283096620
[automerger skipped] Fix bug: include all dirs not just the last one. am: 647bfb356a
am: 33c9a9cae0
-s ours
...
am skip reason: skip tag Change-Id I5724f792ee36c2f66786761e5d55b4f6c456753c with SHA-1 5371607b50
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14188806
Change-Id: I00ab8574f699e1a215307f5027dba6c7ac7d5860
2021-04-14 23:29:01 +00:00
Paul Duffin
8b8ec66ed9
Merge "Make sure that BootJars is super set of ArtApexJars" am: 4d414336cf
am: 49cd9fb8f6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675810
Change-Id: I64d281b7eaf8772f5d09b130ca79f5789fc18e39
2021-04-14 22:48:15 +00:00
Mateusz Zięba
33c9a9cae0
Fix bug: include all dirs not just the last one. am: 647bfb356a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14188806
Change-Id: I1e6dd857a093bddc41584ea9f872ec204a20d01d
2021-04-14 22:48:09 +00:00
Paul Duffin
49cd9fb8f6
Merge "Make sure that BootJars is super set of ArtApexJars" am: 4d414336cf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675810
Change-Id: I385902f04dc7ab96be0dea4fc22811466cd984be
2021-04-14 22:06:28 +00:00
Paul Duffin
4d414336cf
Merge "Make sure that BootJars is super set of ArtApexJars"
2021-04-14 21:24:37 +00:00
Hunter Knepshield
06353ef218
Create a new certificate for 2021 CTS UICCs.
...
This certificate will be used to enforce a clean break between "old" CTS
UICCs and new ones. The new UICCs will have hardware support for new
calculations that the old ones aren't capable of.
Old certificate:
./testkey.x509.pem
SHA-1: 61:ED:37:7E:85:D3:86:A8:DF:EE:6B:86:4B:D8:5B:0B:FA:A5:AF:81
SHA-256: A4:0D:A8:0A:59:D1:70:CA:A9:50:CF:15:C1:8C:45:4D:47:A3:9B:26:98:9D:8B:64:0E:CD:74:5B:A7:1B:F5:DC
New certificate:
./cts_uicc_2021.x509.pem
SHA-1: 06:97:71:39:21:E8:65:D0:1C:45:C4:A8:8D:45:7A:9D:96:F4:39:27
SHA-256: CE:7B:2B:47:AE:2B:75:52:C8:F9:2C:C2:91:24:27:98:83:04:1F:B6:23:A5:F1:94:A8:2C:9B:F1:5D:49:2A:A0
We won't yet submit the change to switch the signature of
CtsCarrierApiTestCases, as that will introduce downstream presubmit and
postsubmit failures until the new hardware is available for device labs.
Bug: 178419755
Test: temporarily switch CtsCarrierApiTestCases to be signed with
cts-uicc-2021-testkey, ensure:
- Suite fails on a device with the old CTS SIM due to lack of carrier
privileges
- Suite passes with updated cuttlefish modem simulator ARF content
Change-Id: I7598426bd3e4db90a8f0d8d80ea03468fb30f876
2021-04-14 14:11:49 -07:00
Ivan Lozano
b2cb6487eb
Merge "Add Rust vendor image support to Make." am: 1e3771f9ed
am: 559d79a186
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1666566
Change-Id: I2f52c52390da266fc89e0169c597f25431ab1b7e
2021-04-14 19:53:22 +00:00
Paul Duffin
2635f9f869
Merge "Avoid adding jacocoagent to bootclasspath twice" am: 55e6511331
am: 2b90008ccd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1675809
Change-Id: I906ecc151fdb71cdeed563d527569c554b288d5f
2021-04-14 19:53:11 +00:00
Paul Duffin
d418e961c8
Make sure that BootJars is super set of ArtApexJars
...
When constructing the dexpreopt config it will strip out any entries in
ART_APEX_JARS which are not present in PRODUCT_BOOT_JARS and store the
remainder in ArtApexJars.
Bug: 185391652
Test: lunch sdk_phone_x86_vendor && m nothing
lunch sdk_phone_x86 && m nothing
Change-Id: I403ef9768a8ac2d222bbd6cfd0a68a2019f67c16
2021-04-14 20:35:58 +01:00
Ivan Lozano
559d79a186
Merge "Add Rust vendor image support to Make." am: 1e3771f9ed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1666566
Change-Id: If6dcf0f9085bb098002807e1c13460e01b3c88ea
2021-04-14 19:13:23 +00:00