Jiyong Park
8f51bd7c57
[automerger skipped] DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly am: 6e8c2f2fd7 am: fec3474be5 am: d45bc489f8 -s ours am: dc9678ead1 -s ours
...
am skip reason: skip tag Change-Id Ic301f0cb262e1caed0e5f9d9836266a7d320f1b6 with SHA-1 1d8befeac8 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I7df8314bde2bab823702ba92cd3d62baac7e8ab5
2021-04-14 15:51:17 +00:00
Jiyong Park
90baef94c7
[automerger skipped] Merge "DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly" am: 83518ced51 am: 004fe382e3 -s ours am: eeb1b42c0e -s ours am: a8e067f17b -s ours
...
am skip reason: skip tag Change-Id Ic301f0cb262e1caed0e5f9d9836266a7d320f1b6 with SHA-1 1d8befeac8 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I4b85a6e483f5b51ae38a61718e491a0b388fd427
2021-04-14 15:51:07 +00:00
Jiyong Park
ccccbb3d06
[automerger skipped] DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly am: 6e8c2f2fd7 am: fec3474be5 -s ours am: afddf9ba73 -s ours am: 95733c24f5 -s ours
...
am skip reason: skip tag Change-Id Ic301f0cb262e1caed0e5f9d9836266a7d320f1b6 with SHA-1 1d8befeac8 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: Ife5779a2c1e57d2f05a0b7d06d9c16418b11852e
2021-04-14 15:51:06 +00:00
Jiyong Park
192e5af120
[automerger skipped] Merge "DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly" am: 83518ced51 am: 004fe382e3 am: a69acc8201 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: Idc43a0f40532a629d0c2791520a34526fbc8f0ba
2021-04-14 15:09:32 +00:00
Jiyong Park
dc9678ead1
[automerger skipped] DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly am: 6e8c2f2fd7 am: fec3474be5 am: d45bc489f8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I6f53bfd40c73aadee6d754bae017c05f41185997
2021-04-14 15:09:32 +00:00
Jiyong Park
a8e067f17b
[automerger skipped] Merge "DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly" am: 83518ced51 am: 004fe382e3 -s ours am: eeb1b42c0e -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: Ie9ff36d518ed07b31c94f3a4f086d5e77d4bf6a7
2021-04-14 15:08:23 +00:00
Jiyong Park
95733c24f5
[automerger skipped] DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly am: 6e8c2f2fd7 am: fec3474be5 -s ours am: afddf9ba73 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I9bf617614871fa622e98308a04ed29259bc1501c
2021-04-14 15:08:22 +00:00
Jiyong Park
a69acc8201
Merge "DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly" am: 83518ced51 am: 004fe382e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I7c38567241b3ec5f6803ada2b7592cae266bf1f9
2021-04-14 14:42:57 +00:00
Jiyong Park
d45bc489f8
DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly am: 6e8c2f2fd7 am: fec3474be5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I09e61d65a3ca391733d3434c456f964c336bee55
2021-04-14 14:42:55 +00:00
Jiyong Park
eeb1b42c0e
[automerger skipped] Merge "DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly" am: 83518ced51 am: 004fe382e3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I33b2949da07280f8d9a36e41b13fbe26fe3a7775
2021-04-14 14:42:40 +00:00
Jiyong Park
afddf9ba73
[automerger skipped] DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly am: 6e8c2f2fd7 am: fec3474be5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I5997d13dd1a635d1c2b7cedc76748cfcf124f3f9
2021-04-14 14:42:39 +00:00
Jiyong Park
004fe382e3
Merge "DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly" am: 83518ced51
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I647cb09a4dedbec903543eed0c14bf00a2b5ca9b
2021-04-14 13:56:19 +00:00
Jiyong Park
fec3474be5
DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly am: 6e8c2f2fd7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1662381
Change-Id: I50f1232006e3deeea403938241fba4f65c743454
2021-04-14 13:56:18 +00:00
Jiyong Park
83518ced51
Merge "DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly"
2021-04-14 13:27:05 +00:00
Jiyong Park
1c2f8a39b6
[automerger skipped] Partial cherry-pick from internal master am: e4409c50bf -s ours am: 72021a0344 -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/+/14174190
Change-Id: I6ba1b7997c5bfcbbedc7bfef580b7b1027d1b3d8
2021-04-14 10:52:00 +00:00
Jiyong Park
72021a0344
[automerger skipped] Partial cherry-pick from internal master am: e4409c50bf -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/+/14174190
Change-Id: I95b1edb89f4cf5abfe73db0ccd3e1b1f09e7ab78
2021-04-14 10:13:37 +00:00
Jiyong Park
e4409c50bf
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-14 09:57:58 +09:00
Jiyong Park
6e8c2f2fd7
DO NOT MERGE: min_sdk_version of prebuilts are recorded correctly
...
This change fixes a bug that min_sdk_versions of android_library_import
are recorded as "(no version)" even when `min_sdk_version` property is
correctly set.
Bug: N/A
Test: m
Merged-In: Ic301f0cb262e1caed0e5f9d9836266a7d320f1b6
Change-Id: Ic301f0cb262e1caed0e5f9d9836266a7d320f1b6
2021-04-13 23:57:30 +00:00
Michael Butler
e929f5977e
[automerger skipped] Merge "Make libaidlcommonsupport available to apex modules" am: 48b55f6094 am: 5ae8861684 am: 060fc04fff -s ours am: 3b5680d63e -s ours
...
am skip reason: skip tag Change-Id I04403eab718161d6a77499e2a9af82ee61ed42af with SHA-1 54ebc0e441 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666504
Change-Id: Iaf7129abd54f909bb6c0761bafd57943c6db3a1a
2021-04-13 19:27:41 +00:00
Michael Butler
3b5680d63e
[automerger skipped] Merge "Make libaidlcommonsupport available to apex modules" am: 48b55f6094 am: 5ae8861684 am: 060fc04fff -s ours
...
am skip reason: skip tag Change-Id I04403eab718161d6a77499e2a9af82ee61ed42af with SHA-1 54ebc0e441 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666504
Change-Id: I60f31e437219922554012581724fc0e22d864181
2021-04-13 18:50:32 +00:00
Michael Butler
a2edfe28ed
[automerger skipped] Merge "Make libaidlcommonsupport available to apex modules" am: 48b55f6094 am: 5ae8861684 -s ours am: 97edea24c7 -s ours
...
am skip reason: skip tag Change-Id I04403eab718161d6a77499e2a9af82ee61ed42af with SHA-1 54ebc0e441 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666504
Change-Id: If194f49cfeba2d0985642245468dd4a15ca896fa
2021-04-13 18:50:04 +00:00
Michael Butler
060fc04fff
Merge "Make libaidlcommonsupport available to apex modules" am: 48b55f6094 am: 5ae8861684
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666504
Change-Id: I145703c9f08409148e3aa9a501d341235cc82c9e
2021-04-13 18:03:03 +00:00
Michael Butler
97edea24c7
[automerger skipped] Merge "Make libaidlcommonsupport available to apex modules" am: 48b55f6094 am: 5ae8861684 -s ours
...
am skip reason: skip tag Change-Id I04403eab718161d6a77499e2a9af82ee61ed42af with SHA-1 54ebc0e441 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666504
Change-Id: I3bc2286ec89912f1d2c70d3470c9ac14ce8a14bd
2021-04-13 18:02:58 +00:00
Michael Butler
5ae8861684
Merge "Make libaidlcommonsupport available to apex modules" am: 48b55f6094
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1666504
Change-Id: If4d3464e9a451f69b9552e0081b91a44fdccb494
2021-04-13 17:13:35 +00:00
Michael Butler
49c2beb93b
[automerger skipped] Make libaidlcommonsupport available to apex modules am: 54ebc0e441 -s ours am: 3713a17ca2 -s ours
...
am skip reason: skip tag Change-Id I04403eab718161d6a77499e2a9af82ee61ed42af with SHA-1 4e11247261 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14162501
Change-Id: Ied39d93165e6c06d5d94a0eee2377a3066741e21
2021-04-13 16:32:22 +00:00
Michael Butler
48b55f6094
Merge "Make libaidlcommonsupport available to apex modules"
2021-04-13 16:29:33 +00:00
Jiyong Park
eb50d852cb
resolve merge conflicts of 5ff82c784a to sc-mainline-prod
...
Merged-In: Ic301f0cb262e1caed0e5f9d9836266a7d320f1b6
Change-Id: Ic6cb9ff708bceedf95da5064b28b2891bc60e612
2021-04-13 13:28:05 +00:00
Michael Butler
3713a17ca2
[automerger skipped] Make libaidlcommonsupport available to apex modules am: 54ebc0e441 -s ours
...
am skip reason: skip tag Change-Id I04403eab718161d6a77499e2a9af82ee61ed42af with SHA-1 4e11247261 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14162501
Change-Id: I9ef4022a73163cd1ff96e8204cacc02b7c0aad56
2021-04-13 12:40:42 +00:00
Jiyong Park
5ff82c784a
Merge "min_sdk_version of prebuilts are recorded correctly" into sc-dev
2021-04-13 11:02:38 +00:00
Michael Butler
54ebc0e441
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-12 12:37:19 -07:00
Michael Butler
2b17e1960f
Merge "Make libaidlcommonsupport available to apex modules" into sc-dev am: 1a96f1e7bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14128944
Change-Id: I3d20aeb8aed86901e2263c9afaaed694f2482f7a
2021-04-12 17:43:51 +00:00
Michael Butler
1a96f1e7bf
Merge "Make libaidlcommonsupport available to apex modules" into sc-dev
2021-04-12 17:22:48 +00:00
Treehugger Robot
ca0941ef8d
[automerger skipped] Merge "Update allowed_deps for connectivity" am: 99d445f759 -s ours am: 9e220372d1 -s ours am: c74544c5e7 -s ours am: 45eeee02a5 -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/+/1662382
Change-Id: I061e972fa3abde924f87b650b48131a2944018d3
2021-04-12 07:17:15 +00:00
Treehugger Robot
857518038b
[automerger skipped] Merge "Update allowed_deps for connectivity" am: 99d445f759 -s ours am: 9e220372d1 -s ours am: de6a0dbb92 -s ours am: 39b5055100 -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/+/1662382
Change-Id: I8cd0f2f776a4caf1219f1a8ac4983274dfc2e268
2021-04-12 07:17:07 +00:00
Treehugger Robot
45eeee02a5
[automerger skipped] Merge "Update allowed_deps for connectivity" am: 99d445f759 -s ours am: 9e220372d1 -s ours am: c74544c5e7 -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/+/1662382
Change-Id: I56de793c0b59f63af284ac52d658c94bb54d4b8a
2021-04-12 06:58:58 +00:00
Treehugger Robot
39b5055100
[automerger skipped] Merge "Update allowed_deps for connectivity" am: 99d445f759 -s ours am: 9e220372d1 -s ours am: de6a0dbb92 -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/+/1662382
Change-Id: Ia3c57f3fbe4141d1dfa393c144aa65f1349024d2
2021-04-12 06:40:05 +00:00
Treehugger Robot
c74544c5e7
[automerger skipped] Merge "Update allowed_deps for connectivity" am: 99d445f759 -s ours am: 9e220372d1 -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/+/1662382
Change-Id: I6903442652b8dd1cfbf78057483be49cb0d65db0
2021-04-12 06:12:34 +00:00
Treehugger Robot
de6a0dbb92
[automerger skipped] Merge "Update allowed_deps for connectivity" am: 99d445f759 -s ours am: 9e220372d1 -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/+/1662382
Change-Id: Ia33b7a5ee9061872ba8df1988e85ff9fe975a1f0
2021-04-12 06:12:31 +00:00
Treehugger Robot
9e220372d1
[automerger skipped] Merge "Update allowed_deps for connectivity" am: 99d445f759 -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/+/1662382
Change-Id: If0165ea416005db9d7f4d612621c25e189f53217
2021-04-12 05:52:23 +00:00
Treehugger Robot
99d445f759
Merge "Update allowed_deps for connectivity"
2021-04-12 05:29:03 +00:00
Jiyong Park
1d8befeac8
min_sdk_version of prebuilts are recorded correctly
...
This change fixes a bug that min_sdk_versions of android_library_import
are recorded as "(no version)" even when `min_sdk_version` property is
correctly set.
Bug: N/A
Test: m
Change-Id: Ic301f0cb262e1caed0e5f9d9836266a7d320f1b6
2021-04-12 13:46:32 +09:00
Remi NGUYEN VAN
e6c971fe01
Update allowed_deps for connectivity
...
All targets were prepared for connectivity modularization, and include
framework-connectivity dependencies, service-connectivity dependencies,
and interfaces with netd and dnsresolver.
Bug: 171540887
Test: m
Merged-In: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
Merged-In: I0d3771c025d3b3cd5782462fc902f92146384d63
(clean cherry-pick from downstream branch)
Change-Id: I0d3771c025d3b3cd5782462fc902f92146384d63
2021-04-12 09:39:17 +09:00
Jiyong Park
7009f3aa72
[automerger skipped] Partial cherry-pick from internal master am: 4e3fd68a63 -s ours am: 5f0e20de1b -s ours am: 41bd8c41f4 -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/+/14124700
Change-Id: I01bb47970bb57a3f39d46d923a800157442f9e40
2021-04-09 13:31:27 +00:00
Jiyong Park
867fc7a6b7
[automerger skipped] Partial cherry-pick from internal master am: 4e3fd68a63 -s ours am: 3ab7a606d2 -s ours am: 6947ab177e -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/+/14124700
Change-Id: I17d84612cd0fe8b44bc88f7247d4f8f5a7b1a532
2021-04-09 13:31:15 +00:00
Jiyong Park
41bd8c41f4
[automerger skipped] Partial cherry-pick from internal master am: 4e3fd68a63 -s ours am: 5f0e20de1b -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/+/14124700
Change-Id: I0d5eb725d7befde87c6de6a3ac7d5da90dc2c40b
2021-04-09 12:52:18 +00:00
Jiyong Park
6947ab177e
[automerger skipped] Partial cherry-pick from internal master am: 4e3fd68a63 -s ours am: 3ab7a606d2 -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/+/14124700
Change-Id: I1c9951017cb082f3b70aedef354a97d4a1206fa6
2021-04-09 12:51:34 +00:00
Jiyong Park
3ab7a606d2
[automerger skipped] Partial cherry-pick from internal master am: 4e3fd68a63 -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/+/14124700
Change-Id: I7ccb22734d55420af3a0d149023e6a2d96146f67
2021-04-09 12:03:37 +00:00
Jiyong Park
5f0e20de1b
[automerger skipped] Partial cherry-pick from internal master am: 4e3fd68a63 -s ours
...
am skip reason: skip tag Change-Id I879d2260c4779f4c88c26fe1c5b6b8a93c159e40 with SHA-1 f334fda89b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14124700
Change-Id: I090033139728cf8db322323c0b07664de8b59ec3
2021-04-09 12:03:28 +00:00
Jiyong Park
4e3fd68a63
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-09 16:19:20 +09:00
Remi NGUYEN VAN
bf2eb8b334
Remove service-connectivity from allowed_deps
...
service-connectivity is now APEX-only, so it does not need to be in
allowed_deps.
Bug: 183691942
Test: m
Change-Id: I8de95d8b803146e4e6aee67e83306fbacc808312
2021-04-09 14:39:12 +09:00