Commit graph

66651 commits

Author SHA1 Message Date
Kalesh Singh
9564f6d6ef Merge "Revert "Add stable aidl memtrack hal to vndk list"" am: 37638180d6 am: 9ba9be0432
Original change: https://android-review.googlesource.com/c/platform/build/+/1530884

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe5412ecba0519b6d6d4ec9ad3d8b557a6d9f253
2020-12-16 01:46:34 +00:00
Kalesh Singh
9ba9be0432 Merge "Revert "Add stable aidl memtrack hal to vndk list"" am: 37638180d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1530884

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0e4648cf0013e3d2c38cc21efc371e2ff0ac0b5
2020-12-16 01:05:13 +00:00
Kalesh Singh
37638180d6 Merge "Revert "Add stable aidl memtrack hal to vndk list"" 2020-12-16 00:48:05 +00:00
Kalesh Singh
009936a198 Revert "Add stable aidl memtrack hal to vndk list"
Revert "Memtrack HAL stable aidl sepolicy"

Revert "Add android.hardware.memtrack-unstable-ndk_platform"

Revert submission 1518702-memtrack-aidl

Reason for revert: Broken tests and boot time regressions
Reverted Changes:
Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor...
Iaf99d0ca4:Add stable aidl memtrack HAL to product packages
Iac54ae2ba:Add stable aidl memtrack hal to vndk list
If310210a3:libmemtrack: Add support for AIDL memtrack HAL
Ib6c634def:Memtrack HAL: Add stable AIDL implementation
I5e1d0e006:Memtrack HAL stable aidl sepolicy

Change-Id: I922441bf3629a5d50672f1466a1f52fb9e2c3cb0
2020-12-16 00:19:38 +00:00
Treehugger Robot
ba1f95499f Merge "Revert^2 "Always turn on compatible property"" am: dec924e081 am: 226df907f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1505351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I320cc0178767465a4d789eecc711b0fbd9d07c94
2020-12-15 16:15:03 +00:00
Treehugger Robot
226df907f0 Merge "Revert^2 "Always turn on compatible property"" am: dec924e081
Original change: https://android-review.googlesource.com/c/platform/build/+/1505351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id68e6e4318a46a7909761876f625692fa975760d
2020-12-15 15:52:45 +00:00
Treehugger Robot
dec924e081 Merge "Revert^2 "Always turn on compatible property"" 2020-12-15 12:00:10 +00:00
Treehugger Robot
7f464d92b7 Merge "Pipe bazel() note text to stderr." am: fc9f1c0002 am: defa193490
Original change: https://android-review.googlesource.com/c/platform/build/+/1527865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ed1b689e41c81313c67bf3e5f2e4c4a48263ca1
2020-12-15 05:54:52 +00:00
Treehugger Robot
defa193490 Merge "Pipe bazel() note text to stderr." am: fc9f1c0002
Original change: https://android-review.googlesource.com/c/platform/build/+/1527865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcf05fc96a2f5fbb9212c56e21487f0cce9be001
2020-12-15 05:18:09 +00:00
Treehugger Robot
fc9f1c0002 Merge "Pipe bazel() note text to stderr." 2020-12-15 05:06:26 +00:00
Treehugger Robot
b73e57cc7b Merge "Allows GSI AVB keys on vendor boot even when not building vendor boot." am: a25382e565 am: bcbd8a7cf9
Original change: https://android-review.googlesource.com/c/platform/build/+/1528487

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If29ea9547c81cdc1cea86a39405976a69c9ca367
2020-12-15 03:35:49 +00:00
Treehugger Robot
bcbd8a7cf9 Merge "Allows GSI AVB keys on vendor boot even when not building vendor boot." am: a25382e565
Original change: https://android-review.googlesource.com/c/platform/build/+/1528487

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11f7210ad4f51a46e718a110b4457f121f14c9c0
2020-12-15 03:23:01 +00:00
Treehugger Robot
a25382e565 Merge "Allows GSI AVB keys on vendor boot even when not building vendor boot." 2020-12-15 02:48:43 +00:00
Treehugger Robot
bb9bad1f5b Merge "Move goldfish RRO to vendor partition" am: 78ee012509 am: 88bdcb8f76
Original change: https://android-review.googlesource.com/c/platform/build/+/1526759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbff098c392b06ad132999c051befbbee8aa0908
2020-12-15 02:23:18 +00:00
Treehugger Robot
88bdcb8f76 Merge "Move goldfish RRO to vendor partition" am: 78ee012509
Original change: https://android-review.googlesource.com/c/platform/build/+/1526759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e27d0760cafa00d901eea587106a3418f3108f0
2020-12-15 02:10:03 +00:00
Treehugger Robot
78ee012509 Merge "Move goldfish RRO to vendor partition" 2020-12-15 01:53:03 +00:00
JaeMan Park
3c3b051f5c Merge "Add java_sdk_library enforcement flag verification" am: c21cde1007 am: 24efe302d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1519538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5946026390b9dc1461de712ba793b04152d46d78
2020-12-15 00:52:59 +00:00
JaeMan Park
a639874a88 Merge "Add java_sdk_library enforcement flags to product.mk" am: d06fe704b3 am: 107ae739e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1512951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I626796f8f0344330d94563694a8849286629fe56
2020-12-15 00:52:44 +00:00
Paul Scovanner
3ed4988ca8 [automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d am: ffc4671fce am: e1b0fa94d3 am: ad55b25e81 -s ours am: 3ab6aebc86 -s ours am: ac631e2014 -s ours am: 3c0dbc409a -s ours
am skip reason: Change-Id I6a1139d288c24a11289fc53c9022fd6d70acd8e6 with SHA-1 d4d46ab023 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I151dab5b128d374025f32792eaf62b8b04b6d94f
2020-12-15 00:44:37 +00:00
JaeMan Park
24efe302d2 Merge "Add java_sdk_library enforcement flag verification" am: c21cde1007
Original change: https://android-review.googlesource.com/c/platform/build/+/1519538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I673c34aa57f7fe039b64c3ebf340b3a6901f194d
2020-12-15 00:37:20 +00:00
JaeMan Park
107ae739e0 Merge "Add java_sdk_library enforcement flags to product.mk" am: d06fe704b3
Original change: https://android-review.googlesource.com/c/platform/build/+/1512951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I499fc54ee143e9c8aaf468be72abc79f7fca8a10
2020-12-15 00:36:02 +00:00
Paul Scovanner
3c0dbc409a [automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d am: ffc4671fce am: e1b0fa94d3 am: ad55b25e81 -s ours am: 3ab6aebc86 -s ours am: ac631e2014 -s ours
am skip reason: Change-Id I6a1139d288c24a11289fc53c9022fd6d70acd8e6 with SHA-1 d4d46ab023 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56bcb5b41366529983430d40982d1b25482f816a
2020-12-15 00:35:29 +00:00
Diego Vela
5367bd3fa7 Merge "Revert "Make ab_ota_partitions read only"" am: 111e9cbf40 am: 5fa60fb418
Original change: https://android-review.googlesource.com/c/platform/build/+/1528745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f5a4626d6e42051252d7a0c23437aad623d72e2
2020-12-15 00:04:05 +00:00
Paul Scovanner
ac631e2014 [automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d am: ffc4671fce am: e1b0fa94d3 am: ad55b25e81 -s ours am: 3ab6aebc86 -s ours
am skip reason: Change-Id I6a1139d288c24a11289fc53c9022fd6d70acd8e6 with SHA-1 d4d46ab023 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9fa44f3eb06da932fc69cc24ececbb0ac82654d
2020-12-15 00:02:23 +00:00
JaeMan Park
c21cde1007 Merge "Add java_sdk_library enforcement flag verification" 2020-12-15 00:00:33 +00:00
JaeMan Park
d06fe704b3 Merge "Add java_sdk_library enforcement flags to product.mk" 2020-12-15 00:00:05 +00:00
Jingwen Chen
c8b5e196ce Pipe bazel() note text to stderr.
This allows subshell-ing bazel, e.g. bazel build $(bazel query //...)

Test: . build/envsetup.sh; bazel build $(bazel query <expression>)
Change-Id: If28b63769032b61e150422cb5b9b4e55c14cd13d
2020-12-14 18:51:50 -05:00
Diego Vela
5fa60fb418 Merge "Revert "Make ab_ota_partitions read only"" am: 111e9cbf40
Original change: https://android-review.googlesource.com/c/platform/build/+/1528745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41073180f8ef20dbcae2df815c9fa0cf7db166fc
2020-12-14 23:30:05 +00:00
Paul Scovanner
3ab6aebc86 [automerger skipped] Update Security String to 2021-02-01 am: ad7b650e2d am: ffc4671fce am: e1b0fa94d3 am: ad55b25e81 -s ours
am skip reason: Change-Id I6a1139d288c24a11289fc53c9022fd6d70acd8e6 with SHA-1 d4d46ab023 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibceff73843f7106c5219786032454de44c414f41
2020-12-14 23:24:33 +00:00
Diego Vela
111e9cbf40 Merge "Revert "Make ab_ota_partitions read only"" 2020-12-14 23:15:40 +00:00
Paul Scovanner
ad55b25e81 Update Security String to 2021-02-01 am: ad7b650e2d am: ffc4671fce am: e1b0fa94d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46824f2d45d2587956f01104d5e774daaa6b0c42
2020-12-14 23:10:08 +00:00
Diego Vela
f03fa0c5f2 Revert "Make ab_ota_partitions read only"
This reverts commit 929f1ad1d6.

Reason for revert: Caused a build break
Bug: 175633875

Change-Id: I6cb518a574c865a2e2c4ecdc4203dfa03bbf05d9
2020-12-14 23:08:31 +00:00
Paul Scovanner
e1b0fa94d3 Update Security String to 2021-02-01 am: ad7b650e2d am: ffc4671fce
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I258d82e7d0a16c94689806168a7a6b02fcbb7897
2020-12-14 22:52:50 +00:00
Paul Scovanner
ffc4671fce Update Security String to 2021-02-01 am: ad7b650e2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13219376

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1c80993bc1c84ec49fea5d3386e02b91eb8cf06
2020-12-14 22:22:11 +00:00
Daniel Norman
6af48c8312 Allows GSI AVB keys on vendor boot even when not building vendor boot.
This allows system-only builds (which disable vendor images) to inherit
from device makefiles that normally place GSI AVB keys on vendor boot.

Bug: 175594737
Test: lunch system-only build, m, observe warning not failure
Change-Id: Ib6c199d0a47b3b3be2143241d83ab586966cfd1e
2020-12-14 13:43:13 -08:00
Treehugger Robot
c28ab30baa Merge "Add stable aidl memtrack hal to vndk list" am: 886049dc15 am: 7c18afcc00
Original change: https://android-review.googlesource.com/c/platform/build/+/1518924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b9bd9b750074d3915ee82c2a9f9a705807c2c89
2020-12-14 19:52:36 +00:00
Paul Scovanner
ad7b650e2d Update Security String to 2021-02-01
Bug: 175313938

Change-Id: I6d6c4a8d4f3e80c40754670ae60718aa42c3265d
Merged-In: I6a1139d288c24a11289fc53c9022fd6d70acd8e6
2020-12-14 19:49:31 +00:00
Anton Hansson
01ccbb5029 Merge "Make ab_ota_partitions read only" am: 3cc8ce9fd3 am: 605616d88b
Original change: https://android-review.googlesource.com/c/platform/build/+/1528250

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7573c5226c6ff13a06efe7d20d28eb88b7a081cb
2020-12-14 19:41:12 +00:00
Treehugger Robot
7c18afcc00 Merge "Add stable aidl memtrack hal to vndk list" am: 886049dc15
Original change: https://android-review.googlesource.com/c/platform/build/+/1518924

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I606da3d99e806c15a112be8d2f0f7283d852bf09
2020-12-14 19:29:18 +00:00
Anton Hansson
605616d88b Merge "Make ab_ota_partitions read only" am: 3cc8ce9fd3
Original change: https://android-review.googlesource.com/c/platform/build/+/1528250

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I259e5a8e78ef3e34493df320bfe2c9d74cf38ccb
2020-12-14 19:26:18 +00:00
Treehugger Robot
886049dc15 Merge "Add stable aidl memtrack hal to vndk list" 2020-12-14 18:36:10 +00:00
Anton Hansson
3cc8ce9fd3 Merge "Make ab_ota_partitions read only" 2020-12-14 18:25:22 +00:00
Automerger Merge Worker
b5799b12ab Merge "Merge "mark zipalign_test as unit tests" am: 31839fe1cd am: c7f432fd1e" into rvc-qpr-dev-plus-aosp 2020-12-14 16:42:21 +00:00
TreeHugger Robot
e75f0995de Merge "Move ro.zygote to vendor" into rvc-qpr-dev-plus-aosp 2020-12-14 16:42:11 +00:00
Julien Desprez
7806391b02 Merge "mark zipalign_test as unit tests" am: 31839fe1cd am: c7f432fd1e
Original change: https://android-review.googlesource.com/c/platform/build/+/1526393

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idccd2d2db86da2fd56265bf39614ab8b3c999931
2020-12-14 16:42:11 +00:00
Julien Desprez
c7f432fd1e Merge "mark zipalign_test as unit tests" am: 31839fe1cd
Original change: https://android-review.googlesource.com/c/platform/build/+/1526393

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5470540a86fa4dc2044cb97c875d1940acc17c0
2020-12-14 16:27:09 +00:00
Julien Desprez
31839fe1cd Merge "mark zipalign_test as unit tests" 2020-12-14 16:11:41 +00:00
Paul Scovanner
b316614965 Update Security String to 2021-02-05 am: d4d46ab023 am: 02819aefbd am: 4de5d521ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13202277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0297f88b04b297796086e4a67e7d33d4c27262b
2020-12-14 16:02:06 +00:00
Tianjie
929f1ad1d6 Make ab_ota_partitions read only
Now that we have moved the AB_OTA_BOOTLOADER_PARTITIONS &
AB_OTA_RADIO_PARTITIONS to BoardConfig, we can make the
ab_ota_partitions read only.

Eventually, the variable will be exposed as a product build
property. And we want its value to stay unchanged during the
build process.

Bug: 162148770
Test: build coral
Merged-In: I37ab41cf2ed7bc9cb6db6b4700c03ab48ed31fff
Change-Id: Ied45347c3e56e56d1372d51b98d7e52b02ff4755
(cherry-picked from commit 6e93f484ac)
2020-12-14 15:47:51 +00:00
Paul Scovanner
4de5d521ff Update Security String to 2021-02-05 am: d4d46ab023 am: 02819aefbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13202277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I216d8e70e6ebc75f8f4cd5efdb0c9b0190ea7866
2020-12-14 15:46:50 +00:00