Brad Ebinger
f956ecfe25
[automerger skipped] Merge "Remove deprecated RcsService/PresencePolling apps" am: 35d002f9f5
am: 8a7d4e1833
am: 2ac5d24397
-s ours
...
am skip reason: Change-Id I0eaa321dfd75de8217c465a523d439ea702deea4 with SHA-1 e94e9b4bb7
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1613859
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1135eb29eb3cf57c5b76546c06977a3b0823ba34
2021-03-04 01:46:49 +00:00
Brad Ebinger
2ac5d24397
Merge "Remove deprecated RcsService/PresencePolling apps" am: 35d002f9f5
am: 8a7d4e1833
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1613859
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I87d97215857d95dbfcd5bbed04433f8cda346c49
2021-03-04 00:31:35 +00:00
Xin Li
b22190f60f
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 2b1c89090f
-s ours am: 5dfe6c0fb9
-s ours am: 65d68287bc
-s ours
...
am skip reason: Change-Id Ifc7f272e273f54df843650e7e74fcad40a76994a with SHA-1 7e3f5430a8
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1611843
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied50440baf65765bf58852e8b52dcb63917666a0
2021-03-04 00:12:11 +00:00
Brad Ebinger
8a7d4e1833
Merge "Remove deprecated RcsService/PresencePolling apps" am: 35d002f9f5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1613859
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7889c79f91182adcf025c425c6b5b5cd2f6bf2d9
2021-03-03 23:51:43 +00:00
Xin Li
65d68287bc
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 2b1c89090f
-s ours am: 5dfe6c0fb9
-s ours
...
am skip reason: Change-Id Ifc7f272e273f54df843650e7e74fcad40a76994a with SHA-1 7e3f5430a8
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1611843
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibdc39567cdf3695d9bd4a6ef4c800994e5bc4494
2021-03-03 23:37:11 +00:00
Brad Ebinger
35d002f9f5
Merge "Remove deprecated RcsService/PresencePolling apps"
2021-03-03 23:24:13 +00:00
Xin Li
5dfe6c0fb9
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 2b1c89090f
-s ours
...
am skip reason: Change-Id Ifc7f272e273f54df843650e7e74fcad40a76994a with SHA-1 7e3f5430a8
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1611843
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97e290fb85b5c8cc54d30ed952bba4075706e53f
2021-03-03 22:29:16 +00:00
Xin Li
2b1c89090f
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:41 +00:00
Xin Li
b2ec711a7f
Merge RQ2A.210305.007
...
Bug: 180401296
Merged-In: Ifc7f272e273f54df843650e7e74fcad40a76994a
Change-Id: I7a08adbca4a7f82be6e56c9ccb88b0ea7d5fc139
2021-03-03 09:12:01 -08:00
Martin Stjernholm
2629c11f49
Merge "Add a product variable to override APEX modules in boot jar lists." am: 2344aacd02
am: a4ecf9761a
am: b3c450c22f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1610907
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icb6b98158492a116da18c2acafa31d43f09a6ae5
2021-03-03 14:33:14 +00:00
Martin Stjernholm
b3c450c22f
Merge "Add a product variable to override APEX modules in boot jar lists." am: 2344aacd02
am: a4ecf9761a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1610907
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf62e0f9c1e9145e68a3d488ac4187a607b592cc
2021-03-03 13:22:25 +00:00
Martin Stjernholm
a4ecf9761a
Merge "Add a product variable to override APEX modules in boot jar lists." am: 2344aacd02
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1610907
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5936ac8ac193d55758bbf82a3fa9fe6dc98b70de
2021-03-03 12:40:37 +00:00
Martin Stjernholm
2344aacd02
Merge "Add a product variable to override APEX modules in boot jar lists."
2021-03-03 11:04:54 +00:00
TreeHugger Robot
142f2ba684
Merge "update vndk list" into sc-dev
2021-03-03 10:54:57 +00:00
Brad Ebinger
21bf64a70a
Remove deprecated RcsService/PresencePolling apps
...
There is now an AOSP API for RCS UCE, removed the
deprecated RcsService/PresencePolling app targets.
Bug: 178489990
Test: make + inspect build
Merged-In: I0eaa321dfd75de8217c465a523d439ea702deea4
Change-Id: I0eaa321dfd75de8217c465a523d439ea702deea4
2021-03-03 00:47:38 +00:00
Treehugger Robot
8553466070
Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435ec4
am: 7e3f5430a8
am: b46772a79b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595337
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I120d96d5ff600e257a7784c195aa2f821622389b
2021-03-02 21:57:04 +00:00
Treehugger Robot
b65277cb8f
Merge "Fix typo in sysprop.mk and Changes.md" am: 1996d581d8
am: f2507339e5
am: 23d3ec56c4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1612294
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52e7a12250ace7988589f07ea4c055d69f910da7
2021-03-02 21:56:56 +00:00
Martin Stjernholm
efe6a4d748
Add a product variable to override APEX modules in boot jar lists.
...
Test: m droid SOONG_CONFIG_art_module_source_build=false
on internal branch
Bug: 180325915
Change-Id: I3ab64860fe4a60468ec8dad6517d1d67f72f13c7
2021-03-02 20:53:59 +00:00
Treehugger Robot
b46772a79b
Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435ec4
am: 7e3f5430a8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595337
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4763abe15d7ac7ed149002f6d5d3fae621e71631
2021-03-02 20:37:57 +00:00
Treehugger Robot
23d3ec56c4
Merge "Fix typo in sysprop.mk and Changes.md" am: 1996d581d8
am: f2507339e5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1612294
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I53928ac906d8a8aae18ce8fa2e7bd006ae878570
2021-03-02 20:35:31 +00:00
Treehugger Robot
7e3f5430a8
Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435ec4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595337
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifc7f272e273f54df843650e7e74fcad40a76994a
2021-03-02 19:58:45 +00:00
Treehugger Robot
f2507339e5
Merge "Fix typo in sysprop.mk and Changes.md" am: 1996d581d8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1612294
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaac0c7796e5ed0c91df42f14d1d23bf861e74ac0
2021-03-02 19:58:12 +00:00
Treehugger Robot
b1fc88399a
Merge "Allow BOARD_VNDK_VERSION to be changed" am: 0181c7d33c
am: 0fa0300013
am: 9831e65e7c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1608053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d8ef55f5276cf90e77505d9bb91bf1e0ea8b306
2021-03-02 19:54:13 +00:00
Treehugger Robot
d10f3b8a86
Merge "Update m help text with guidance on parallelism" am: f3b8056189
am: afeb2bc404
am: dfafe5581f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1612064
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I21188e23fd71e8d94698fb43a7943352d001198d
2021-03-02 19:53:24 +00:00
TreeHugger Robot
4e23e68775
[automerger skipped] Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am: 0547bfd774
-s ours am: aed0408259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13724871
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae2175b6bb49e6b6043a313773c4267bd71103a5
2021-03-02 19:52:36 +00:00
Treehugger Robot
9831e65e7c
Merge "Allow BOARD_VNDK_VERSION to be changed" am: 0181c7d33c
am: 0fa0300013
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1608053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I981a375b3ca7ea0d949a1810c8ef7a347c98c96e
2021-03-02 18:46:26 +00:00
Treehugger Robot
dfafe5581f
Merge "Update m help text with guidance on parallelism" am: f3b8056189
am: afeb2bc404
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1612064
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0cd87d502d2e626be0cb9b9942ba38845a2ef5d
2021-03-02 18:46:03 +00:00
TreeHugger Robot
aed0408259
[automerger skipped] Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am: 0547bfd774
-s ours
...
am skip reason: skipped by user delphij
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13724871
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e84adf1a35774018c3a4c012eec1627cecf7b6e
2021-03-02 18:44:22 +00:00
Jeongik Cha
b84e1deb5e
update vndk list
...
Bug: 150578172
Bug: 180417006
Test: m
Change-Id: I096b2c9f165a88c9725f4c63c87c7a9deab72f72
2021-03-02 22:46:48 +09:00
Treehugger Robot
36c1435ec4
Merge "Include android_soong_config_vars.mk in the make (kati) step."
2021-03-02 09:20:37 +00:00
Treehugger Robot
1996d581d8
Merge "Fix typo in sysprop.mk and Changes.md"
2021-03-02 08:10:08 +00:00
Treehugger Robot
0fa0300013
Merge "Allow BOARD_VNDK_VERSION to be changed" am: 0181c7d33c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1608053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1469d7db94532250ccded11a58f2fee99dea2c96
2021-03-02 02:05:12 +00:00
Treehugger Robot
afeb2bc404
Merge "Update m help text with guidance on parallelism" am: f3b8056189
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1612064
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c9de7523364d907232b038447e4aa07be3aa812
2021-03-02 02:04:36 +00:00
Treehugger Robot
0181c7d33c
Merge "Allow BOARD_VNDK_VERSION to be changed"
2021-03-02 01:22:45 +00:00
Treehugger Robot
f3b8056189
Merge "Update m help text with guidance on parallelism"
2021-03-02 01:11:33 +00:00
TreeHugger Robot
0547bfd774
Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master
2021-03-02 01:09:06 +00:00
Donghyun Jo
8c65ef6574
Fix typo in sysprop.mk and Changes.md
...
android_info_pro -> android_info_prop
partititon -> partition
PRODUCT_SYSTEM_PROPERITES -> PRODUCT_SYSTEM_PROPERTIES
Test: build and manual test
Signed-off-by: Donghyun Jo <donghyun.jo@samsung.com>
Change-Id: I0b7f0566aaa5ce8844003bb4f373389c20ddeb88
2021-03-02 08:51:03 +09:00
Andrew Scull
2633b1ee80
Merge "Add pvmfw partition to target files" am: 5553b5704c
am: 2f8015f71a
am: 40b2f65837
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595341
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I66ddfe52ad75c155697fa89b20f8430005479adf
2021-03-01 23:22:19 +00:00
Martin Stjernholm
786bbea407
Include android_soong_config_vars.mk in the make (kati) step.
...
Test: `m nothing` with https://r.android.com/1592872
Bug: 172480615
Change-Id: I960cd234a5dd607f4f5af6bb68ae15b9bd104e7a
2021-03-01 23:14:10 +00:00
Andrew Scull
40b2f65837
Merge "Add pvmfw partition to target files" am: 5553b5704c
am: 2f8015f71a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595341
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ae8d013955639b805e135f88753f27460dfed1b
2021-03-01 22:31:35 +00:00
Andrew Scull
2f8015f71a
Merge "Add pvmfw partition to target files" am: 5553b5704c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595341
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I83e3ecd8d6cf9847c38508ab088ccb66d193c7a7
2021-03-01 21:48:32 +00:00
Colin Cross
3fb7ddf3bc
Update m help text with guidance on parallelism
...
Remove "-j" from the default recommended arguments and add a paragraph
describing the -j behavior.
Test: m help
Change-Id: Id5a5f4719f18ea2a9d09df43f5fb38592a59f5c9
2021-03-01 13:32:13 -08:00
Andrew Scull
5553b5704c
Merge "Add pvmfw partition to target files"
2021-03-01 21:05:56 +00:00
Xin Li
643f0a07bf
[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 457b809bcc
-s ours am: 47e7a1746f
-s ours
...
am skip reason: subject contains skip directive
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc8a1a50f226c438d082ddff0da7d03786d05565
2021-03-01 10:15:50 +00:00
Xin Li
47e7a1746f
[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 457b809bcc
-s ours
...
am skip reason: Change-Id Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc with SHA-1 011aee1bc9
is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e30545b59d22f6ff76cda1226048153dcd616e6
2021-03-01 09:24:18 +00:00
Treehugger Robot
c5163facef
Merge "support pre-defined timestamp and uuid when bulid EROFS images" am: 0a4788c3fb
am: 011aee1bc9
am: 0ba7c56987
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595714
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I43809b95af3d8a5a8d8a21e54cb54c23b25d5bae
2021-03-01 09:06:31 +00:00
Xin Li
3f904dd415
Merge RQ2A.210305.007 into stage.
...
Bug: 180401296
Merged-In: I6d6542306c51ac1682f02cbce6701688d2bdbea2
Change-Id: I1c3a82d5c420fbb97e81379034947d35024b0925
2021-03-01 00:54:23 -08:00
Xin Li
457b809bcc
DO NOT MERGE - Mark RQ2A.210105.001 as merged.
...
Bug: 180401296
Merged-In: Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc
Change-Id: I4a86e7513cb1aac30c431674427a658fe24ae374
2021-03-01 00:43:12 -08:00
Treehugger Robot
0ba7c56987
Merge "support pre-defined timestamp and uuid when bulid EROFS images" am: 0a4788c3fb
am: 011aee1bc9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595714
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iea9dfca2f270b0985f51390e76113c7cee58f95d
2021-03-01 08:11:17 +00:00
Treehugger Robot
011aee1bc9
Merge "support pre-defined timestamp and uuid when bulid EROFS images" am: 0a4788c3fb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1595714
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc
2021-03-01 07:25:30 +00:00