Commit Graph

1055 Commits

Author SHA1 Message Date
TreeHugger Robot
32ee0308bc Merge "Update the apex-dependency allow list" into sc-dev am: 4592671232
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14048527

Change-Id: Ia8f02e55611b4a3532f580f587a9c8ca46569fe6
2021-04-09 05:36:17 +00:00
TreeHugger Robot
4592671232 Merge "Update the apex-dependency allow list" into sc-dev 2021-04-09 05:21:17 +00:00
Michael Butler
4e11247261 Make libaidlcommonsupport available to apex modules
Making libaidlcommonsupport available to apex has the following impact
on affected apex modules. All sizes were collected on top-of-tree
git_master for cf_x86_64_phone-userdebug.

libaidlcommonsupport.a:
* lib: 93K
* lib64: 128K

Diff from minimally including libaidlcommonsupport:
* lib/libneuralnetworks.so: +1K
* lib/libneuralnetworks_shim.so: +0K
* lib64/libneuralnetworks.so: +1K
* lib64/libneuralnetworks_shim.so: +0K

There's only a small change in size to libneuralnetworks.so and
libneuralnetworks_shim.so because both had code that performed the same
conversions that are done in libaidlcommonsupport.

Bug: 183118727
Test: mma
Change-Id: I04403eab718161d6a77499e2a9af82ee61ed42af
Merged-In: I04403eab718161d6a77499e2a9af82ee61ed42af
(cherry picked from commit dfe8b24fad)
2021-04-09 02:08:00 +00:00
Cody Kesting
0164a1e20d Update allowed_deps for networkstack-aidl-interfaces.
This CL updates the allowed_deps for networkstack-aidl-interfaces to
match the updated AIDL level.

This CL was auto-generated by running:
packages/modules/common/build/update-apex-allowed-deps.sh

Bug: 162407730
Test: compiles
Change-Id: Ied8d1f206b7885dc48ce81ddd010c21530eebc56
2021-04-08 07:42:05 -07:00
Jiyong Park
e788b3ffb3 [automerger skipped] Merge "Partial cherry-pick from internal master" into sc-dev am: 6f427a09cc -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 059f1a2888 is already in history

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

Change-Id: Iba81c8cea3e3002f123c67fff0a57e34ac47c286
2021-04-08 12:05:03 +00:00
Jiyong Park
6f427a09cc Merge "Partial cherry-pick from internal master" into sc-dev 2021-04-08 11:46:36 +00:00
Jiyong Park
70cd6108a2 [automerger skipped] Partial cherry-pick from internal master am: f898518ada -s ours am: d7fdfa5de6 -s ours am: 0de5a17b73 -s ours am: ac108bc173 -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/+/1669265

Change-Id: I38fa53eb21f531928bfde5bf61b906ce2dc57c13
2021-04-08 11:37:50 +00:00
Jiyong Park
2931b57707 [automerger skipped] Partial cherry-pick from internal master am: f898518ada -s ours am: d7fdfa5de6 -s ours am: 99786ea9ae -s ours am: ef98606dde -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/+/1669265

Change-Id: I295eaa7bc77c05ca3b57171061a15a124e5f0bde
2021-04-08 11:37:19 +00:00
Jiyong Park
ac108bc173 [automerger skipped] Partial cherry-pick from internal master am: f898518ada -s ours am: d7fdfa5de6 -s ours am: 0de5a17b73 -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/+/1669265

Change-Id: I49bf5569b24a2cf4ae01f28c0676d482d4c34cc3
2021-04-08 11:20:44 +00:00
Jiyong Park
ef98606dde [automerger skipped] Partial cherry-pick from internal master am: f898518ada -s ours am: d7fdfa5de6 -s ours am: 99786ea9ae -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/+/1669265

Change-Id: I9d06d2775b19cc828a2213666b326968fc7b4b2f
2021-04-08 11:02:18 +00:00
Jiyong Park
0de5a17b73 [automerger skipped] Partial cherry-pick from internal master am: f898518ada -s ours am: d7fdfa5de6 -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/+/1669265

Change-Id: I3dcb308750f30356eb732d3e71af68a8930ba554
2021-04-08 10:35:24 +00:00
Jiyong Park
99786ea9ae [automerger skipped] Partial cherry-pick from internal master am: f898518ada -s ours am: d7fdfa5de6 -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 f334fda89b is already in history

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

Change-Id: Ibf729a33794b405df50158d51f0108840024f0d2
2021-04-08 10:35:14 +00:00
Jiyong Park
1f117fa59c Partial cherry-pick from internal master
... to avoid merge conflict of changes from aosp/master.

Bug: N/A
Test: m

Merged-In: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
Merged-In: I08a1911b00076b141aeab9016a29b0200104b308
Change-Id: I3050616d67be53e14c82d8f91e1e6c1134c80eca
2021-04-08 19:24:48 +09:00
Jiyong Park
d7fdfa5de6 [automerger skipped] Partial cherry-pick from internal master am: f898518ada -s ours
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 f334fda89b is already in history

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

Change-Id: I2cae776aaf90e9538c412647cf52ef798b44d8dc
2021-04-08 09:27:57 +00:00
Jiyong Park
f898518ada Partial cherry-pick from internal master
... to avoid merge conflict of changes from aosp/master.

Bug: N/A
Test: m

Merged-In: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
Change-Id: I08a1911b00076b141aeab9016a29b0200104b308
2021-04-08 13:18:11 +09:00
Xiao Ma
c0593fe44e Merge "Remove obsolete networkstack-aidl-interfaces version deps manually." into sc-dev am: 60a0c2045d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14104378

Change-Id: I53de3d2bce822eacd5605b67b10ce4f5723d5faa
2021-04-08 01:36:35 +00:00
Xiao Ma
60a0c2045d Merge "Remove obsolete networkstack-aidl-interfaces version deps manually." into sc-dev 2021-04-08 00:49:09 +00:00
Michael Butler
9abd27683a Make libaidlcommonsupport available to apex modules
Making libaidlcommonsupport available to apex has the following impact
on affected apex modules. All sizes were collected on top-of-tree
git_master for cf_x86_64_phone-userdebug.

libaidlcommonsupport.a:
* lib: 93K
* lib64: 128K

Diff from minimally including libaidlcommonsupport:
* lib/libneuralnetworks.so: +1K
* lib/libneuralnetworks_shim.so: +0K
* lib64/libneuralnetworks.so: +1K
* lib64/libneuralnetworks_shim.so: +0K

There's only a small change in size to libneuralnetworks.so and
libneuralnetworks_shim.so because both had code that performed the same
conversions that are done in libaidlcommonsupport.

Bug: 183118727
Test: mma
Change-Id: I04403eab718161d6a77499e2a9af82ee61ed42af
Merged-In: I04403eab718161d6a77499e2a9af82ee61ed42af
(cherry picked from commit dfe8b24fad)
2021-04-07 12:53:19 -07:00
Anton Hansson
7acbf6c602 [automerger skipped] Merge "Revert^2 "Update androidx min_sdk_version in allowed_deps"" am: f3282bd901 am: 3b7b83b946 -s ours am: adc0d27e6c am: 9c19d21046
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666021

Change-Id: I4f2eab7aa01ce7e11fb03f65adf1c62d9178981c
2021-04-07 13:25:30 +00:00
Anton Hansson
9c19d21046 [automerger skipped] Merge "Revert^2 "Update androidx min_sdk_version in allowed_deps"" am: f3282bd901 am: 3b7b83b946 -s ours am: adc0d27e6c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666021

Change-Id: I6c644bac4679cf0ec59da69b31130564833d45cb
2021-04-07 13:07:49 +00:00
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
adc0d27e6c [automerger skipped] Merge "Revert^2 "Update androidx min_sdk_version in allowed_deps"" am: f3282bd901 am: 3b7b83b946 -s ours
am skip reason: skipped by user hansson

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

Change-Id: I842b89acaa3aa0723d4a4d53f1a10a55e26b25b4
2021-04-07 12:22:44 +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
Xiao Ma
5ccfb89228 Remove obsolete networkstack-aidl-interfaces version deps manually.
Remove networkstack-aidl-interfaces-java(minSdkVersion:29) and
networkstack-aidl-interfaces-V9-java(minSdkVersion:29) and keep
the allowed deps synced with AOSP.

Bug: 161838070
Test: m
Test: atest NetworkStackIntegrationTest NetworkStackTests
Test: verify wifi connection works manually
Change-Id: Idad9eccbf3b8482e54c833a04f770928233d4c98
2021-04-07 08:21:20 +00:00
Yi-Ling Chuang
91267c8e65 Update the apex-dependency allow list
PermissionController is using SettingsLibCollapsingToolbarBaseActivity.
As SettingsLibCollapsingToolbarBaseActivity depends on
SettingsLibSettingsTransition, so we have to include the transition lib
into the apex-dependency allow list.

Bug: 177480673
Test: rebuild
Change-Id: I3d88491e36992e63eb261d0c36c4d2d3ba552644
2021-04-07 11:33:51 +08: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