Daniel Norman
53e6cc65d8
Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor." am: fc596c996f
am: 3efc0cd50c
am: 42ced0a63e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1549532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d11544b32061d5038b87794c79978ed9d410e8e
2021-01-15 18:44:11 +00:00
Daniel Norman
42ced0a63e
Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor." am: fc596c996f
am: 3efc0cd50c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1549532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8438550235a041ea52c9c886d526942ef4daf865
2021-01-15 18:00:47 +00:00
Daniel Norman
3efc0cd50c
Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor." am: fc596c996f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1549532
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2936a38f877bcb4107262019c18f57cb8ea7e85a
2021-01-15 17:22:38 +00:00
Daniel Norman
fc596c996f
Merge "Stops including extra VNDK apexes if the VNDK current apex is on vendor."
2021-01-15 16:31:58 +00:00
Yabin Cui
6fe1f2ebf5
Merge "Disable unsigned-shift-base by default." am: 7604390e4c
am: 80140ebb26
am: c85e1a5f7c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1551634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idf3de1b864cd27b39ae6bd9adaa570c070ad2d3e
2021-01-15 14:04:00 +00:00
Treehugger Robot
2839eaeef9
Merge "Make ro.product.cpu.abilist.* to be fetched dynamically" am: d041e4babf
am: b0af9fadb1
am: 15420a24ad
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1538725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I637d056b7cea18ea3684632f1cef6a48a845fdb5
2021-01-15 13:59:18 +00:00
Janis Danisevskis
f244cc64a9
Merge "Update gsi/current.txt with secure clock and shared secret services." am: 46b0d8c8ef
am: 024af72520
am: 7bf768b871
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1541312
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iadc293e8041289a5eaa5f82568348aaa9dcb7fe0
2021-01-15 13:55:17 +00:00
Yabin Cui
c85e1a5f7c
Merge "Disable unsigned-shift-base by default." am: 7604390e4c
am: 80140ebb26
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1551634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I45d6b6b41616ecdaa3b9797f7fbe97e091f78d7c
2021-01-15 01:13:12 +00:00
Yabin Cui
80140ebb26
Merge "Disable unsigned-shift-base by default." am: 7604390e4c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1551634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I358911a212bbfc7f80b07a5c2e9092f331eed5c7
2021-01-15 00:28:00 +00:00
Yabin Cui
7604390e4c
Merge "Disable unsigned-shift-base by default."
2021-01-15 00:17:36 +00:00
Yabin Cui
462c12dfae
Disable unsigned-shift-base by default.
...
New clang compiler enables unsigned-shift-base as part of
integer sanitizers. But it makes some daemons crash at
libc++.
Bug: 177566116
Test: build.
Change-Id: I6d64fa5002b6035be4d960441eb5176c97152af9
2021-01-14 14:14:08 -08:00
Daniel Norman
c3d7fff348
Stops including extra VNDK apexes if the VNDK current apex is on vendor.
...
This is needed for merged mixed-release builds where the vendor half on
release N contains VNDK current (vN) on /vendor. This change prevents
the system half on release N+k from placing another copy of VNDK vN
on /system_ext.
Test: Build and merge crosshatch with S system and R vendor, boot
Bug: 176993126
Change-Id: I5322931244e060b2e7c92d9578e5eb64b098d1d6
2021-01-14 20:22:48 +00:00
Treehugger Robot
15420a24ad
Merge "Make ro.product.cpu.abilist.* to be fetched dynamically" am: d041e4babf
am: b0af9fadb1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1538725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1690b69b4b1e07d67e7a331388f6648e8e4ecfe3
2021-01-14 18:49:55 +00:00
Janis Danisevskis
7bf768b871
Merge "Update gsi/current.txt with secure clock and shared secret services." am: 46b0d8c8ef
am: 024af72520
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1541312
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib71d701bd06d8463d3ffaeb092ed5e4db459d276
2021-01-14 18:48:17 +00:00
Treehugger Robot
b0af9fadb1
Merge "Make ro.product.cpu.abilist.* to be fetched dynamically" am: d041e4babf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1538725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic8b7b2fae228654223998695100bb1b48978bb29
2021-01-14 18:36:32 +00:00
Treehugger Robot
d041e4babf
Merge "Make ro.product.cpu.abilist.* to be fetched dynamically"
2021-01-14 18:34:22 +00:00
Janis Danisevskis
024af72520
Merge "Update gsi/current.txt with secure clock and shared secret services." am: 46b0d8c8ef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1541312
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icdc0a43377679d296aa1d0133a9c9ca58661eb97
2021-01-14 18:33:17 +00:00
Janis Danisevskis
46b0d8c8ef
Merge "Update gsi/current.txt with secure clock and shared secret services."
2021-01-14 18:04:02 +00:00
Martin Stjernholm
6224be2e29
Merge "Add check that a module doesn't try to override itself." am: 23e4ab2edf
am: 0e4bbd3549
am: adb3687d73
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1533446
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id19742825d10eb552e25f0a0681f8dc021a4f232
2021-01-14 12:24:01 +00:00
Martin Stjernholm
adb3687d73
Merge "Add check that a module doesn't try to override itself." am: 23e4ab2edf
am: 0e4bbd3549
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1533446
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb68345001dbc6c5b92be63c9f24bc0ae6a237a1
2021-01-14 11:53:25 +00:00
Martin Stjernholm
0e4bbd3549
Merge "Add check that a module doesn't try to override itself." am: 23e4ab2edf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1533446
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff6d3825c37fffb017a362f3c2abe3e84a63953f
2021-01-14 11:16:12 +00:00
Martin Stjernholm
23e4ab2edf
Merge "Add check that a module doesn't try to override itself."
2021-01-14 10:36:25 +00:00
Treehugger Robot
fdb82cbb13
Merge "jacoco-report-classes-all.jar doesn't depend on fake modules" am: 0c6951f829
am: 85a38236a9
am: 2b26a9c3cb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1549483
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42fc6b017fbd8c5c8109ac627fe61b3e9185d983
2021-01-14 05:02:57 +00:00
Treehugger Robot
2b26a9c3cb
Merge "jacoco-report-classes-all.jar doesn't depend on fake modules" am: 0c6951f829
am: 85a38236a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1549483
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7c0e212c156009f7a3dc6984314e74470cad06bf
2021-01-14 04:42:57 +00:00
Treehugger Robot
85a38236a9
Merge "jacoco-report-classes-all.jar doesn't depend on fake modules" am: 0c6951f829
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1549483
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iffccbd0df1eb72cde92c8c6ecd23d309e1ba1a76
2021-01-14 04:19:54 +00:00
Treehugger Robot
0c6951f829
Merge "jacoco-report-classes-all.jar doesn't depend on fake modules"
2021-01-14 00:28:17 +00:00
TreeHugger Robot
de88ee9ea3
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
am: b571c86e23
-s ours am: a2414b4459
am: cceb3cfbfe
am: 62d6adedb0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ef0365871aa1e14496d6c9b6042febe3d3bb0f2
2021-01-13 23:52:40 +00:00
Paul Scovanner
a9d4663527
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
am: f90adf9770
-s ours am: 2ce3a46193
am: 3919de87e4
am: fc52cd97fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23392103be263bc5cfeebafea32f13508228ac6e
2021-01-13 23:52:07 +00:00
TreeHugger Robot
62d6adedb0
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
am: b571c86e23
-s ours am: a2414b4459
am: cceb3cfbfe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1526f3d8dba34d49eaef7eef8c768b811a4adc3
2021-01-13 23:32:06 +00:00
TreeHugger Robot
c540a98950
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
am: b571c86e23
-s ours am: a2414b4459
am: c869291339
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icb072f0ad9fc7d4fc33d50e37316b7cb6d6cc26e
2021-01-13 23:32:06 +00:00
Paul Scovanner
fc52cd97fc
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
am: f90adf9770
-s ours am: 2ce3a46193
am: 3919de87e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifcd7eba017d3e8f2556911029cdfda00f43a8294
2021-01-13 23:31:49 +00:00
Paul Scovanner
86511908a7
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
am: f90adf9770
-s ours am: 2ce3a46193
am: 64ba7f7b89
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7d095e17538bf05f6b35f4127bcecfd3c811db5
2021-01-13 23:31:46 +00:00
TreeHugger Robot
c869291339
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
am: b571c86e23
-s ours am: a2414b4459
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I33a72dd7646290bc3f14a3218b49b40bead355ff
2021-01-13 22:50:14 +00:00
Paul Scovanner
64ba7f7b89
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
am: f90adf9770
-s ours am: 2ce3a46193
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I426d479d3274311c21a8b448a1dd75b72e361459
2021-01-13 22:50:08 +00:00
TreeHugger Robot
cceb3cfbfe
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
am: b571c86e23
-s ours am: a2414b4459
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I322f869ef8539a6d0e8f5797bfe8c71a8f7df087
2021-01-13 22:49:19 +00:00
Paul Scovanner
3919de87e4
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
am: f90adf9770
-s ours am: 2ce3a46193
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5da86031aaf3423344772f2c511d3f33e3268859
2021-01-13 22:49:14 +00:00
TreeHugger Robot
a2414b4459
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
am: b571c86e23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f0f16b8d8ba32a0eeaca74dfe1a101098f8a39b
2021-01-13 22:18:23 +00:00
Paul Scovanner
2ce3a46193
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
am: f90adf9770
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id38a848923de96dc9671e12d5ed2bd8f125f2395
2021-01-13 22:18:12 +00:00
Yifan Hong
689eb3c805
Merge "GetBootImageBuildProp returns None if file does not exist" am: 7a27574e5f
am: 465b5033d6
am: 0a1ec72b05
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1548355
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id5848459069de2e7be64cc9c1b8f5af8bcbef705
2021-01-13 22:09:44 +00:00
TreeHugger Robot
b571c86e23
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I643a58a7a943360410b136f8e40d62b89e9a1308
2021-01-13 21:26:09 +00:00
Paul Scovanner
f90adf9770
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours am: 6be7cf235f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie12d51c462daf0df846c34810dd37fe0ad6bd99f
2021-01-13 21:26:02 +00:00
Yifan Hong
0a1ec72b05
Merge "GetBootImageBuildProp returns None if file does not exist" am: 7a27574e5f
am: 465b5033d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1548355
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ebf9fcba3f2fa3ab6318791729cc399529bf337
2021-01-13 20:58:07 +00:00
TreeHugger Robot
2ff4253b5b
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06a0037560251822d5e21dd53b4f521e1d5929c7
2021-01-13 20:48:03 +00:00
Paul Scovanner
6be7cf235f
[automerger skipped] DO NOT MERGE am: d703d4e453
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6fc2e44aeee6774170036b03be3ff57955eebf5
2021-01-13 20:47:51 +00:00
TreeHugger Robot
b4a76d1317
[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf980fce1aa4944e6427a383ed6abb3b1c58b401
2021-01-13 20:46:32 +00:00
Yifan Hong
465b5033d6
Merge "GetBootImageBuildProp returns None if file does not exist" am: 7a27574e5f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1548355
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4232495e6972c23a7cd8e159a44174e78c1a53c5
2021-01-13 20:36:33 +00:00
TreeHugger Robot
8fd807bb0d
Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev
2021-01-13 20:17:08 +00:00
Yifan Hong
7a27574e5f
Merge "GetBootImageBuildProp returns None if file does not exist"
2021-01-13 19:40:13 +00:00
Anton Hansson
94830c5514
[automerger skipped] Merge "Use 64 bit binder in module builds" am: 75232ce489
am: b27d9c665e
am: 81c965bca8
-s ours
...
am skip reason: Change-Id Ie62261ecc0f0967f677a890a382fa1da060f7ff2 with SHA-1 c0423c8dae
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1549377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc1eed5167a6263541419ecb976139d5e4ac8031
2021-01-13 19:21:41 +00:00
Anton Hansson
81c965bca8
Merge "Use 64 bit binder in module builds" am: 75232ce489
am: b27d9c665e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1549377
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I953c783ed7b633932bd38f97e53ee3033de7f9f8
2021-01-13 19:02:18 +00:00