Treehugger Robot
f01b50e77a
[automerger skipped] Merge "[IRadioConfig] Adding to VNDK" am: 03e14fc4c0
-s ours am: 59b0252656
-s ours am: e870216f04
-s ours am: 9b67cfaa05
-s ours
...
am skip reason: Merged-In Ifdbac8646bd20849fe4111f75f411426c5a23248 with SHA-1 1c6dad568d
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1826955
Change-Id: I4523c261b36705f98a01e7c38e5724ab46428180
2021-09-22 02:48:49 +00:00
Treehugger Robot
9b67cfaa05
[automerger skipped] Merge "[IRadioConfig] Adding to VNDK" am: 03e14fc4c0
-s ours am: 59b0252656
-s ours am: e870216f04
-s ours
...
am skip reason: Merged-In Ifdbac8646bd20849fe4111f75f411426c5a23248 with SHA-1 1c6dad568d
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1826955
Change-Id: Icd86b2a216fa7af1083d54e60e1dfca5dbbe24f6
2021-09-22 02:31:52 +00:00
Treehugger Robot
e870216f04
[automerger skipped] Merge "[IRadioConfig] Adding to VNDK" am: 03e14fc4c0
-s ours am: 59b0252656
-s ours
...
am skip reason: Merged-In Ifdbac8646bd20849fe4111f75f411426c5a23248 with SHA-1 1c6dad568d
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1826955
Change-Id: Ia80fd6b0580d8503dbaa400bb796ca48589cfc35
2021-09-22 02:17:35 +00:00
Treehugger Robot
59b0252656
[automerger skipped] Merge "[IRadioConfig] Adding to VNDK" am: 03e14fc4c0
-s ours
...
am skip reason: Merged-In Ifdbac8646bd20849fe4111f75f411426c5a23248 with SHA-1 1c6dad568d
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1826955
Change-Id: Id42c1a951b389be57cae2e137a835fbc2f8185c7
2021-09-22 02:01:06 +00:00
Treehugger Robot
03e14fc4c0
Merge "[IRadioConfig] Adding to VNDK"
2021-09-22 01:49:23 +00:00
Serik Beketayev
0501dd68ee
[IRadioConfig] Adding to VNDK am: 1c6dad568d
am: e29bdb8610
am: 47db7b4bae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15875826
Change-Id: I27efeeab202db82e024bfa5067fbe4d600d4d691
2021-09-21 18:14:05 +00:00
Serik Beketayev
47db7b4bae
[IRadioConfig] Adding to VNDK am: 1c6dad568d
am: e29bdb8610
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15875826
Change-Id: Id89e0aaf4756add5b08e9b587c5d7eaae76fe34f
2021-09-21 17:56:39 +00:00
Serik Beketayev
e29bdb8610
[IRadioConfig] Adding to VNDK am: 1c6dad568d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15875826
Change-Id: I5d12163d5a44f64e24d299f5ff71dad708a08721
2021-09-21 17:42:41 +00:00
Serik Beketayev
1c6dad568d
[IRadioConfig] Adding to VNDK
...
Generated IRadioConfig.aidl and dependencies using tool
hidl2aidl.
Bug: 198331805
Test: m android.hardware.radio.config
Change-Id: Ifdbac8646bd20849fe4111f75f411426c5a23248
Merged-In: Ifdbac8646bd20849fe4111f75f411426c5a23248
2021-09-21 04:52:59 +00:00
Serik Beketayev
e0707317d9
[IRadioConfig] Adding to VNDK
...
Generated IRadioConfig.aidl and dependencies using tool
hidl2aidl.
Bug: 198331805
Test: m android.hardware.radio.config
Change-Id: Ifdbac8646bd20849fe4111f75f411426c5a23248
Merged-In: Ifdbac8646bd20849fe4111f75f411426c5a23248
2021-09-20 17:32:25 -07:00
Alexander Smundak
3650c9c9fc
Merge "Make global config depend on version defaults." am: b9306ac477
am: 64f39fec22
am: ffaa210dca
am: 7405f1757d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1822533
Change-Id: Id9ed243898d251dd665ce7737bbdf6e576778887
2021-09-20 18:10:18 +00:00
Alexander Smundak
7405f1757d
Merge "Make global config depend on version defaults." am: b9306ac477
am: 64f39fec22
am: ffaa210dca
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1822533
Change-Id: I78d64800648db7a349cece2db44bba5ad1a7de89
2021-09-20 17:43:45 +00:00
Alexander Smundak
ffaa210dca
Merge "Make global config depend on version defaults." am: b9306ac477
am: 64f39fec22
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1822533
Change-Id: I19899584b5da0acafe9b1cb23157ba5a94b9b5a7
2021-09-20 17:31:20 +00:00
Alexander Smundak
64f39fec22
Merge "Make global config depend on version defaults." am: b9306ac477
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1822533
Change-Id: I6ec80bf9f029eb7f5dca2d25118d030cad386c3b
2021-09-20 17:13:56 +00:00
Alexander Smundak
b9306ac477
Merge "Make global config depend on version defaults."
2021-09-20 16:56:10 +00:00
Jingwen Chen
457d4dbda7
Merge "Remove module_name_to_label short circuit from m." am: 4528968faf
am: 6492201d28
am: 12b73bc1f5
am: 685f419e0f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1829694
Change-Id: I720114bc61542fff7a4378cf0c0a1e8019303bd9
2021-09-20 11:48:08 +00:00
Jingwen Chen
685f419e0f
Merge "Remove module_name_to_label short circuit from m." am: 4528968faf
am: 6492201d28
am: 12b73bc1f5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1829694
Change-Id: I7d95340f8ff241db93528bc972540307b86f33fe
2021-09-20 09:21:42 +00:00
Jingwen Chen
12b73bc1f5
Merge "Remove module_name_to_label short circuit from m." am: 4528968faf
am: 6492201d28
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1829694
Change-Id: I0bc543d68a7406a4518d372a9956440293663e02
2021-09-20 09:06:29 +00:00
Jingwen Chen
6492201d28
Merge "Remove module_name_to_label short circuit from m." am: 4528968faf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1829694
Change-Id: I0e7254c18451a656531049390b3a0ee83ce7d81f
2021-09-20 08:43:59 +00:00
Jingwen Chen
4528968faf
Merge "Remove module_name_to_label short circuit from m."
2021-09-20 08:27:34 +00:00
Yuntao Xu
9913325355
Merge "move cts-test-coverage" am: 68be5b858c
am: 272c630c5f
am: eb83f1f0d6
am: 4cac3f9286
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792
Change-Id: I2f9dc99863017fafd114b13ff795d280fefd6a9f
2021-09-18 00:17:35 +00:00
Yuntao Xu
4cac3f9286
Merge "move cts-test-coverage" am: 68be5b858c
am: 272c630c5f
am: eb83f1f0d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792
Change-Id: I458a41d5ffde6f574986393234d391071e926228
2021-09-18 00:03:44 +00:00
Yuntao Xu
eb83f1f0d6
Merge "move cts-test-coverage" am: 68be5b858c
am: 272c630c5f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792
Change-Id: I0ab460568ac52dde7400f71d791fbec7afba71ea
2021-09-17 23:41:57 +00:00
Yuntao Xu
272c630c5f
Merge "move cts-test-coverage" am: 68be5b858c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1828792
Change-Id: I99cf14fe6e7795ab5afbe6c29ce55e608352c64a
2021-09-17 23:27:11 +00:00
Yuntao Xu
68be5b858c
Merge "move cts-test-coverage"
2021-09-17 23:13:58 +00:00
TreeHugger Robot
a5d558efa5
[automerger skipped] Merge "[DO NOT MERGE] Update Security String to 2021-11-05" into sc-v2-dev am: 9c80832dbf
-s ours
...
am skip reason: Merged-In Ifa8ff73fae3900b2942a30f225272b7a0a4bd289 with SHA-1 e7cb2e6c8a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15844671
Change-Id: I67191eb3aebc5c1e8e91bfc2af4250d0a3e878b5
2021-09-17 22:46:20 +00:00
TreeHugger Robot
9c80832dbf
Merge "[DO NOT MERGE] Update Security String to 2021-11-05" into sc-v2-dev
2021-09-17 22:35:05 +00:00
Paul Scovanner
1509179e5b
[DO NOT MERGE]
...
Update Security String to 2021-11-05
Bug: 199784479
Change-Id: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
Merged-In: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
2021-09-17 21:52:39 +00:00
Paul Scovanner
e7cb2e6c8a
[DO NOT MERGE]
...
Update Security String to 2021-11-05
Bug: 199784479
Change-Id: Ifa8ff73fae3900b2942a30f225272b7a0a4bd289
2021-09-17 18:59:56 +00:00
Sasha Smundak
b2220c2990
Make global config depend on version defaults.
...
Starlark-based product configuration can now share version settings
with makefile product config (mk2rbc converts version_defaults.mk into
version_defaults.rbc which is consumed by runtime initialization).
Bug: 198995713
Test: rbcrun build/make/tests/run.rbc
Change-Id: I1d3ddfed3b15d346b3e10714a195a9f0a3a55a56
2021-09-17 11:00:29 -07:00
Jingwen Chen
0e4eba1544
Remove module_name_to_label short circuit from m.
...
This wasn't adding much value, let's remove it for now until we decide
on how mixed builds will be exposed for users later.
Test: USE_BAZEL_ANALYSIS=1 m droid
Change-Id: I16465fd7759646964ea8c50aab6ab91f47c5e8d1
2021-09-17 08:45:30 +00:00
Treehugger Robot
dc873f5ab0
Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814
am: d656f50618
am: b939ae8c2a
am: ff5ae8967d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032
Change-Id: I42457fdc78e3dd75db83e42345a9dc546c57826d
2021-09-17 07:00:22 +00:00
Treehugger Robot
ff5ae8967d
Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814
am: d656f50618
am: b939ae8c2a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032
Change-Id: I1a34002186eee09649da3433c05d6a39b0d37102
2021-09-17 06:44:26 +00:00
Treehugger Robot
b939ae8c2a
Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814
am: d656f50618
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032
Change-Id: I5eed84b57b03d81777e52ed116118820718b7383
2021-09-17 06:29:30 +00:00
Treehugger Robot
d656f50618
Merge "Stop disting monolithic SDK for Mac SDK builds" am: 1646ba0814
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1829032
Change-Id: I2bda18219770a634add3716a3de215b8fc41cba6
2021-09-17 06:08:53 +00:00
Treehugger Robot
1646ba0814
Merge "Stop disting monolithic SDK for Mac SDK builds"
2021-09-17 05:55:47 +00:00
Paul Scovanner
e512fe2606
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours am: 8e6eb662d9
-s ours am: 98c2172cb8
-s ours am: c0c4cc2ce5
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I53abda562462cb16d1fc28b4d94c18dd618520de
2021-09-17 00:58:55 +00:00
Paul Scovanner
548235e189
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours am: dfe7a28d3f
-s ours am: d3882c9027
-s ours am: da6c47ed7a
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I89ee20d7162de80901bb43bafecbadd40ed8d92a
2021-09-17 00:58:48 +00:00
Paul Scovanner
ead0e2951a
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours am: 8e6eb662d9
-s ours am: 98c2172cb8
-s ours am: 027b2b7c21
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I19911318526b653d47ae52d8158540e260a9ddfb
2021-09-17 00:58:44 +00:00
Paul Scovanner
48aabbd17a
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours am: dfe7a28d3f
-s ours am: d3882c9027
-s ours am: 1f8b5ddf8a
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I9644f9747606341c098018f362fe30eea7343c30
2021-09-17 00:58:37 +00:00
Paul Scovanner
096579b9d9
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours am: 8e6eb662d9
-s ours am: dc89987284
-s ours am: 543b2bc50b
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I6e83baa9988bf7210d5f674a0fa8b1a164f30639
2021-09-17 00:58:29 +00:00
Paul Scovanner
7c3cc262fb
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours am: dfe7a28d3f
-s ours am: 01b23ce87c
-s ours am: 735405b2a2
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I3d6c98fd9097e29354dd66ae2399d953e6a00486
2021-09-17 00:58:15 +00:00
Paul Scovanner
027b2b7c21
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours am: 8e6eb662d9
-s ours am: 98c2172cb8
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I0fbe98bf070228dbb1c18cb2d43ef24bb60e4472
2021-09-17 00:46:26 +00:00
Paul Scovanner
1f8b5ddf8a
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours am: dfe7a28d3f
-s ours am: d3882c9027
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: Id0c6d30dab17521506415d616218be379aa13a24
2021-09-17 00:46:20 +00:00
Paul Scovanner
c0c4cc2ce5
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours am: 8e6eb662d9
-s ours am: 98c2172cb8
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I6cbc983c1a5074b7016a8b5f0770ae296f98a149
2021-09-17 00:44:20 +00:00
Paul Scovanner
da6c47ed7a
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours am: dfe7a28d3f
-s ours am: d3882c9027
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: Iec21473cd900c07ec0da9a2bed4f7066fb80b2a1
2021-09-17 00:44:05 +00:00
Paul Scovanner
543b2bc50b
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours am: 8e6eb662d9
-s ours am: dc89987284
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I2e72e1adf11746808cb4317ab1c8a497ec50b8d1
2021-09-17 00:43:45 +00:00
Paul Scovanner
735405b2a2
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours am: dfe7a28d3f
-s ours am: 01b23ce87c
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: Ie6958ff55af8808b5f724138363a3e1f347cf6bc
2021-09-17 00:43:40 +00:00
Paul Scovanner
98c2172cb8
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: 6cbee400fc
-s ours am: 8e6eb662d9
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I1f836f3d4fa414b45061f3d0aefbebdc1ebec317
2021-09-17 00:29:41 +00:00
Paul Scovanner
d3882c9027
[automerger skipped] Update Security String to 2021-11-01 am: bdb63576ff
am: 51b1e117c7
am: 5593bbe1f7
am: e297219ec0
am: aae5a4b668
-s ours am: dfe7a28d3f
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: I36a66aa6b38bdb6220990fce2813ff61a1f0428f
2021-09-17 00:29:37 +00:00