Commit Graph

232 Commits

Author SHA1 Message Date
Anton Hansson
ba21749b51 [automerger skipped] Merge "Revert^2 "Update androidx min_sdk_version in allowed_deps"" am: f3282bd901 am: 3b7b83b946 am: 10c1fe1b47 -s ours am: 3eee319283
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666021

Change-Id: Ib6ee7f21b0b3109fdac2f8e1906988cb422aeb0c
2021-04-07 13:04:11 +00:00
Anton Hansson
3eee319283 [automerger skipped] Merge "Revert^2 "Update androidx min_sdk_version in allowed_deps"" am: f3282bd901 am: 3b7b83b946 am: 10c1fe1b47 -s ours
am skip reason: skipped by user hansson

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666021

Change-Id: I4c0fc11e50aa60b5b0c40d39ed6ac3a38a9c9215
2021-04-07 12:27:35 +00:00
Anton Hansson
10c1fe1b47 Merge "Revert^2 "Update androidx min_sdk_version in allowed_deps"" am: f3282bd901 am: 3b7b83b946
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666021

Change-Id: Iab520b9b4ddb9676a7681e18bdb35828caca5b38
2021-04-07 11:26:13 +00:00
Anton Hansson
3b7b83b946 Merge "Revert^2 "Update androidx min_sdk_version in allowed_deps"" am: f3282bd901
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666021

Change-Id: I2666ac5b283899e115bc4d3a924c40c333a73bc0
2021-04-07 10:39:40 +00:00
Anton Hansson
f3282bd901 Merge "Revert^2 "Update androidx min_sdk_version in allowed_deps"" 2021-04-07 10:13:05 +00:00
Anton Hansson
ca1ccc3528 Update allowed_deps.txt
...ahead of updating androidx min_sdk_version.

Test: m apex-allowed-deps-check with other patches
Merged-In: Id0c097440d6d75936c1035902084f52e7c786001
Change-Id: Id0c097440d6d75936c1035902084f52e7c786001
2021-04-07 10:11:13 +00:00
Christian Wailes
3025fbffc0 [automerger skipped] Merge "Add libartservice to the visibility for system server defaults" am: b22395a0a0 am: 35306090ac am: 05f9e895e2 -s ours am: 302fbddbbc -s ours
am skip reason: skip tag Change-Id Ica7ec614d5463225a3895a1bc7d96cd10a6eed4c with SHA-1 dec8aafb9b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1595433

Change-Id: I26b318075c787bff05371bd8e480726b0161c8f1
2021-04-06 22:46:04 +00:00
Christian Wailes
302fbddbbc [automerger skipped] Merge "Add libartservice to the visibility for system server defaults" am: b22395a0a0 am: 35306090ac am: 05f9e895e2 -s ours
am skip reason: skip tag Change-Id Ica7ec614d5463225a3895a1bc7d96cd10a6eed4c with SHA-1 dec8aafb9b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1595433

Change-Id: Iea9d60b83e8c3020883f265301a842edec8914bd
2021-04-06 22:29:03 +00:00
Christian Wailes
f1d8fe71da [automerger skipped] Merge "Add libartservice to the visibility for system server defaults" am: b22395a0a0 am: 35306090ac am: 12bec5bd91 -s ours am: f6b6e3775e -s ours
am skip reason: skip tag Change-Id Ica7ec614d5463225a3895a1bc7d96cd10a6eed4c with SHA-1 dec8aafb9b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1595433

Change-Id: Idecd1fa7513ba1f8952643ea826f9615f674639c
2021-04-06 22:25:51 +00:00
Christian Wailes
f6b6e3775e [automerger skipped] Merge "Add libartservice to the visibility for system server defaults" am: b22395a0a0 am: 35306090ac am: 12bec5bd91 -s ours
am skip reason: skip tag Change-Id Ica7ec614d5463225a3895a1bc7d96cd10a6eed4c with SHA-1 dec8aafb9b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1595433

Change-Id: I706e522156a81714b641cb0e80be2298c5e1e9e6
2021-04-06 21:59:05 +00:00
Jack He
611f1ccf78 [automerger skipped] Revert "Update androidx min_sdk_version in allowed_deps" am: baa2df35ab am: 7a63c14cbe -s ours am: 526149eb9a -s ours am: d9dda2db5f -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history. Skip tag was found from reverted change I2f4dc7585066ac35115bb53bdaefe797ee692b0d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1665861

Change-Id: Ib3006dd529ab698ca20e90974c97d136e7afd365
2021-04-06 21:30:21 +00:00
Jack He
d9dda2db5f [automerger skipped] Revert "Update androidx min_sdk_version in allowed_deps" am: baa2df35ab am: 7a63c14cbe -s ours am: 526149eb9a -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history. Skip tag was found from reverted change I2f4dc7585066ac35115bb53bdaefe797ee692b0d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1665861

Change-Id: Ie70c255718cc15edb16e40b6b787c0f25a07ac92
2021-04-06 21:11:21 +00:00
Jack He
7e9040c28d [automerger skipped] Revert "Update androidx min_sdk_version in allowed_deps" am: baa2df35ab am: 7a63c14cbe am: 05cd3cff4b -s ours am: 9eb0f95702 -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history. Skip tag was found from reverted change I2f4dc7585066ac35115bb53bdaefe797ee692b0d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1665861

Change-Id: I9ee2949dfcea80401e6562f7a04420bab2663342
2021-04-06 21:10:18 +00:00
Christian Wailes
12bec5bd91 Merge "Add libartservice to the visibility for system server defaults" am: b22395a0a0 am: 35306090ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1595433

Change-Id: I86d66550fb7010878226e44aa50c8c12fc09c2d0
2021-04-06 21:08:50 +00:00
Christian Wailes
05f9e895e2 Merge "Add libartservice to the visibility for system server defaults" am: b22395a0a0 am: 35306090ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1595433

Change-Id: I778cc1474ec6a82a55fed9e19892d3bcf3c14680
2021-04-06 21:07:12 +00:00
Christian Wailes
35306090ac Merge "Add libartservice to the visibility for system server defaults" am: b22395a0a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1595433

Change-Id: Ia7e90c43c63e31ee713ab21bd425541042c6a4da
2021-04-06 20:42:48 +00:00
Jack He
526149eb9a [automerger skipped] Revert "Update androidx min_sdk_version in allowed_deps" am: baa2df35ab am: 7a63c14cbe -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history. Skip tag was found from reverted change I2f4dc7585066ac35115bb53bdaefe797ee692b0d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1665861

Change-Id: I717c6db507edae82f071f1cba750a408483b282a
2021-04-06 20:35:41 +00:00
Christian Wailes
b22395a0a0 Merge "Add libartservice to the visibility for system server defaults" 2021-04-06 20:30:18 +00:00
Jack He
9eb0f95702 [automerger skipped] Revert "Update androidx min_sdk_version in allowed_deps" am: baa2df35ab am: 7a63c14cbe am: 05cd3cff4b -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history. Skip tag was found from reverted change I2f4dc7585066ac35115bb53bdaefe797ee692b0d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1665861

Change-Id: If160b25fae71a2da9b69a7fe50ecb5fa08864f71
2021-04-06 19:55:33 +00:00
Jack He
05cd3cff4b Revert "Update androidx min_sdk_version in allowed_deps" am: baa2df35ab am: 7a63c14cbe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1665861

Change-Id: I5696c841604c7599f41ba95f44a8812de321cc09
2021-04-06 19:50:17 +00:00
Jack He
7a63c14cbe Revert "Update androidx min_sdk_version in allowed_deps" am: baa2df35ab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1665861

Change-Id: I3fe06898ea47fb00dc01237018d98d013bfa4239
2021-04-06 19:29:57 +00:00
Anton Hansson
e927c4551d Revert^2 "Update androidx min_sdk_version in allowed_deps"
baa2df35ab

Change-Id: I0122ecba201018065a855a858072ba82cf1ee6b5
2021-04-06 19:21:34 +00:00
Jack He
baa2df35ab Revert "Update androidx min_sdk_version in allowed_deps"
Revert "Set min_sdk_version for java imports in pom2bp"

Revert "Give pom2bp -default-min-sdk-version 24 param"

Revert submission 1662079-axd

Bug: 184656328
Reason for revert: Break build
Reverted Changes:
I2f4dc7585:Update androidx min_sdk_version in allowed_deps
I5cb8c736d:Give pom2bp -default-min-sdk-version 24 param
I3b029315a:Set min_sdk_version for java imports in pom2bp

Change-Id: Ib5c74b01c356419f42886517c1f3fd9d21421371
2021-04-06 18:52:50 +00:00
Anton Hansson
cdd603ca3d [automerger skipped] Update androidx min_sdk_version in allowed_deps am: 16e7fd7184 am: 27f7e155de am: baee597d3c -s ours am: b0279b6bd8 -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662079

Change-Id: If476aea9a963ad7627adc90ea8423e3cac4f77ca
2021-04-06 14:21:23 +00:00
Anton Hansson
f008d91278 [automerger skipped] Update androidx min_sdk_version in allowed_deps am: 16e7fd7184 am: 27f7e155de -s ours am: 091d70a81d -s ours am: 630b6d1650 -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662079

Change-Id: I1462ad9c89ba80a6dafd4bbe744b83624230837e
2021-04-06 14:21:03 +00:00
Anton Hansson
b0279b6bd8 [automerger skipped] Update androidx min_sdk_version in allowed_deps am: 16e7fd7184 am: 27f7e155de am: baee597d3c -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662079

Change-Id: I16b742f84cb529db50a5dec770acf330fc3f0266
2021-04-06 13:42:26 +00:00
Anton Hansson
630b6d1650 [automerger skipped] Update androidx min_sdk_version in allowed_deps am: 16e7fd7184 am: 27f7e155de -s ours am: 091d70a81d -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662079

Change-Id: I44be5c6800fb8a0d058f2a95fe06ee6752649eb2
2021-04-06 13:42:02 +00:00
Anton Hansson
baee597d3c Update androidx min_sdk_version in allowed_deps am: 16e7fd7184 am: 27f7e155de
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662079

Change-Id: If87f9a5f2f25c0992ef5ddfd111cdcaca2d06714
2021-04-06 12:57:02 +00:00
Anton Hansson
091d70a81d [automerger skipped] Update androidx min_sdk_version in allowed_deps am: 16e7fd7184 am: 27f7e155de -s ours
am skip reason: skip tag Change-Id I2f4dc7585066ac35115bb53bdaefe797ee692b0d with SHA-1 68281cc236 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662079

Change-Id: I8eaf0769e8980cf3d72a229fb17f930dc1804f9a
2021-04-06 12:56:51 +00:00
Anton Hansson
27f7e155de Update androidx min_sdk_version in allowed_deps am: 16e7fd7184
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662079

Change-Id: I8ee4c5ac839b9b27f837d57dd7dcbeea33226c46
2021-04-06 12:35:50 +00:00
Christian Wailes
97c03eb0a9 Merge "Add libartservice to the visibility for system server defaults" into sc-dev am: 9ee03d7a21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14054113

Change-Id: I1c9ebf59cd2849af1b546d2a68028d5aff84d01e
2021-04-06 00:45:28 +00:00
Christian Wailes
9ee03d7a21 Merge "Add libartservice to the visibility for system server defaults" into sc-dev 2021-04-06 00:02:38 +00:00
Anton Hansson
16e7fd7184 Update androidx min_sdk_version in allowed_deps
We can properly annotate java_imports now, so update androidx
java_imports to min_sdk_version 24.

Test: m apex-allowed-deps-check
Merged-In: I2f4dc7585066ac35115bb53bdaefe797ee692b0d
Change-Id: I2f4dc7585066ac35115bb53bdaefe797ee692b0d
2021-04-02 15:53:32 +09:00
Anton Hansson
9488d76370 Update androidx min_sdk_version in allowed_deps am: 68281cc236 am: 6bd1b61b12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14064745

Change-Id: Ic4f6dbedbc8d0b9a528b3a824693a46207bf35dd
2021-04-01 15:02:40 +00:00
Anton Hansson
6bd1b61b12 Update androidx min_sdk_version in allowed_deps am: 68281cc236
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14064745

Change-Id: I9b53a2112fcacee0dd15b647ed97bcb5648b43da
2021-04-01 14:24:46 +00:00
Anton Hansson
68281cc236 Update androidx min_sdk_version in allowed_deps
We can properly annotate java_imports now, so update androidx
java_imports to min_sdk_version 24.

Test: m apex-allowed-deps-check
Change-Id: I2f4dc7585066ac35115bb53bdaefe797ee692b0d
2021-04-01 13:36:16 +01:00
Chris Wailes
dec8aafb9b Add libartservice to the visibility for system server defaults
Test: m update-api
Bug: 177273468
Merged-In: Ica7ec614d5463225a3895a1bc7d96cd10a6eed4c
Change-Id: Ica7ec614d5463225a3895a1bc7d96cd10a6eed4c
2021-03-31 12:32:23 -07:00
Anton Hansson
19fbe1a228 [automerger skipped] Update allowed_deps for androidx sdk_version change am: f334fda89b am: c7354cc001 am: bcb9c2796e -s ours am: a30bbecf62 -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 059f1a2888 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1652475

Change-Id: I2bb92ad16b9a33814846fe81947e4f03d92f0982
2021-03-31 17:09:44 +00:00
Anton Hansson
8029adb676 [automerger skipped] Update allowed_deps for androidx sdk_version change am: f334fda89b am: c7354cc001 -s ours am: 375bf49ba7 -s ours am: 36928b91b5 -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 059f1a2888 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1652475

Change-Id: Iabaa0fdc3474188a47525482e687b2139d1f987c
2021-03-31 17:08:40 +00:00
Anton Hansson
a30bbecf62 [automerger skipped] Update allowed_deps for androidx sdk_version change am: f334fda89b am: c7354cc001 am: bcb9c2796e -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 059f1a2888 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1652475

Change-Id: I444a73219bddfbc8d3f2d9ab00e2585a912379a9
2021-03-31 16:26:23 +00:00
Anton Hansson
36928b91b5 [automerger skipped] Update allowed_deps for androidx sdk_version change am: f334fda89b am: c7354cc001 -s ours am: 375bf49ba7 -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 059f1a2888 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1652475

Change-Id: I32c80187b5e2bca54738ecaec3f03dff55f93788
2021-03-31 16:25:34 +00:00
Anton Hansson
bcb9c2796e Update allowed_deps for androidx sdk_version change am: f334fda89b am: c7354cc001
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1652475

Change-Id: Ib7d14a68ceff59f1afbce7c944e35e75834f969d
2021-03-31 15:43:12 +00:00
Anton Hansson
375bf49ba7 [automerger skipped] Update allowed_deps for androidx sdk_version change am: f334fda89b am: c7354cc001 -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 059f1a2888 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1652475

Change-Id: I1b79bcf93e2a4f1700271e76547decaa596d3e87
2021-03-31 15:43:07 +00:00
Anton Hansson
c7354cc001 Update allowed_deps for androidx sdk_version change am: f334fda89b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1652475

Change-Id: I6a67fce504720a4fb60447d159b381ce5e4ed185
2021-03-31 15:03:15 +00:00
Chris Wailes
0f36225c44 Add libartservice to the visibility for system server defaults
Test: m update-api
Bug: 177273468
Merged-In: Ica7ec614d5463225a3895a1bc7d96cd10a6eed4c
Change-Id: Ica7ec614d5463225a3895a1bc7d96cd10a6eed4c
2021-03-30 12:39:43 -07:00
Anton Hansson
924e391bdb Update allowed_deps for androidx sdk_version change am: 059f1a2888 am: d65fb1e96a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14033927

Change-Id: I40aa5563a1aa144239b1ddc16b8e37ab0b071b82
2021-03-30 18:26:40 +00:00
Anton Hansson
d65fb1e96a Update allowed_deps for androidx sdk_version change am: 059f1a2888
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14033927

Change-Id: Ic4dc5977dc1e0850e93b1641a077dd07f947365d
2021-03-30 17:45:50 +00:00
Lorenzo Colitti
4a73495133 Merge "Update allowed_deps for connectivity module" into sc-dev am: 2c1f52a09f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/13996946

Change-Id: I7da42f7cab0344849f302ecc02a31ab78a57b6df
2021-03-30 14:59:25 +00:00
Anton Hansson
f334fda89b Update allowed_deps for androidx sdk_version change
sdk_version: "30" implies min_sdk_version "30". Ideally we'd like to
specify a lower min_sdk_version here, but java_import does not support
min_sdk_version at the moment.

Test: m apex-allowed-deps-check
Merged-In: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
Change-Id: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
2021-03-30 15:38:40 +01:00
Anton Hansson
059f1a2888 Update allowed_deps for androidx sdk_version change
sdk_version: "30" implies min_sdk_version "30". Ideally we'd like to
specify a lower min_sdk_version here, but java_import does not support
min_sdk_version at the moment.

Test: m apex-allowed-deps-check
Change-Id: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
2021-03-30 15:37:30 +01:00