Colin Cross
ed44fff308
Follow rename of libc_headers_arch to libc_llndk_headers am: 5eef775673
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1680165
Change-Id: I40158de1ec7ee358400ebff51a2f392a60118af6
2021-04-28 17:52:00 +00:00
Anton Hansson
a615f29359
Add androidx libs with min_sdk 30 to allowed_deps
...
Certain branches do not have the soong patches that fixed the
min_sdk_version of java_import.
Test: m apex-allowed-deps-check
Change-Id: I9b0590b3989a736cc278fea90b3516eeb53e0a2c
(cherry picked from commit 9f262059a1217575367aeee84e5734d587c92abb)
2021-04-28 14:01:43 +01:00
Anton Hansson
87e6b19d8d
Add libunwind_llvm to allowed deps
...
Needed in an internal branch for certain kinds of builds.
Test: m apex-allowed-deps-check
Change-Id: Ia9a6f19c5591feffdc228aea360c504e46d19055
(cherry picked from commit 2b3b590d185768ce1f24bb53f554819fff2d47da)
2021-04-28 13:59:11 +01:00
Mathew Inwood
a1041433e8
Updates to generate_ml_bundle. am: 8e7f80acb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14328945
Change-Id: I31db4b521a3b5acd8d9479f4c6b8ca01625cd358
2021-04-28 12:18:46 +00:00
Mathew Inwood
8e7f80acb9
Updates to generate_ml_bundle.
...
- Update for new stubs location
- Add -p option to set prefer=true
- Add -a option to also update artifacts
Test: ./packages/modules/common/generate_ml_bundle.sh $(pwd) $(pwd) 30
Bug: 180769414
Change-Id: I0dc2a788c091d27ff2b76b14b09b626d85154434
2021-04-28 09:54:42 +00:00
Colin Cross
5eef775673
Follow rename of libc_headers_arch to libc_llndk_headers
...
Bug: 170784825
Test: m checkbuild
Change-Id: Idfc5b493eb499f8d80c6c205d6ae7a87c83d3ccc
2021-04-26 17:56:46 -07:00
satayev
f6043a7f15
Fix allowed_deps.txt on sc-mainline-prod.
...
Bug: 185209711
Fixes: 186364119
Test: run update_allowed_deps.txt
Change-Id: I9452db99c6495c4fd330b65e43845a6b4d3aa21c
Merged-In: I9452db99c6495c4fd330b65e43845a6b4d3aa21c
2021-04-26 11:26:18 +00:00
Ken Chen
606324b626
Make netd_aidl_interface-V6-java available for connectivity
...
netd_aidl_interface-V6-java provides new API that referenced by
ConnectivityService.
Bug: 182460808
Bug: 171872481
Test: m
Change-Id: Iefd3b8215d9d21afe82fedfad368d4952e0e9019
2021-04-25 16:31:00 +08:00
satayev
e81216b992
[automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: a3db6cbd5f -s ours am: 0284577be2 -s ours am: b7a36795e4 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310
Change-Id: Ic347dcbbd24097b4da58ea4cc0638071cc20728d
2021-04-23 21:45:38 +00:00
satayev
a65b676403
[automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ours am: 21651b0046 -s ours am: 9b227be644 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228
Change-Id: I363028b67b5182329ba091db2e2092d6397991e6
2021-04-23 21:45:34 +00:00
satayev
234fe0f18f
[automerger skipped] Re-generated allow-deps.txt. am: fc3f50920c -s ours am: 3a0adf34e9 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14293721
Change-Id: I57b19cad6ff4f5211fe2693978e875e84de0a6ae
2021-04-23 21:45:03 +00:00
satayev
b7a36795e4
[automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: a3db6cbd5f -s ours am: 0284577be2 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310
Change-Id: Ibff61817e544988ce5013896059b37d2772286fa
2021-04-23 21:13:52 +00:00
satayev
9b227be644
[automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ours am: 21651b0046 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228
Change-Id: Ieed216cfcb6ca29a8ec5b64e1d60ffd2c74906fc
2021-04-23 21:13:49 +00:00
satayev
3a0adf34e9
[automerger skipped] Re-generated allow-deps.txt. am: fc3f50920c -s ours
...
am skip reason: skipped by user satayev
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14293721
Change-Id: Ic19171dd4a0404ca26e3508102925e9ef39a8c07
2021-04-23 21:13:46 +00:00
satayev
558f6d2160
[automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: a3db6cbd5f -s ours am: abae854c55 -s ours am: 8782aa9a34 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310
Change-Id: I9d9c724b0d2be17029abb1fdbe926686ae61995d
2021-04-23 20:50:46 +00:00
satayev
8782aa9a34
[automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: a3db6cbd5f -s ours am: abae854c55 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310
Change-Id: I4760ac0da21fbe5e9a5fb3150b925b89cbe26d7a
2021-04-23 20:30:08 +00:00
satayev
abae854c55
[automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: a3db6cbd5f -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310
Change-Id: Ic1e5b93c3e66c68690e3827bf3ebb64ff72061fc
2021-04-23 20:10:23 +00:00
satayev
0284577be2
[automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: a3db6cbd5f -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310
Change-Id: Id28740762d51889fc1fe61366725513c72df6884
2021-04-23 20:10:18 +00:00
satayev
e1ce0ed09e
[automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ours am: f528a3f27c -s ours am: eaff3449e8 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 0a42ee8b6c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228
Change-Id: I7d98518afa9de480ddf076e2e898590f80539b9c
2021-04-23 20:00:46 +00:00
satayev
a3db6cbd5f
[automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310
Change-Id: I2fea18e13d225768ca41cf9592b17eff8c21980f
2021-04-23 19:46:02 +00:00
satayev
eaff3449e8
[automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ours am: f528a3f27c -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 ad750e09ed is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228
Change-Id: I455160490e81e24dc1f999d7e5ec7d7dd3824376
2021-04-23 19:37:39 +00:00
satayev
f528a3f27c
[automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 ad750e09ed is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228
Change-Id: I14506321ed8624cb771c6bcfe829cc1d5396f856
2021-04-23 19:16:46 +00:00
satayev
21651b0046
[automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ours
...
am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 fc3f50920c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228
Change-Id: I3b7dde56a56909f12357d15a6ab517e922e44676
2021-04-23 19:16:42 +00:00
satayev
0a42ee8b6c
resolve merge conflicts of 7d36e910f7 to sc-mainline-prod
...
Bug: 185209711
Test: run packages/modules/common/build/update-apex-allowed-deps.sh
Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
Merged-In: I09d28383d61fa6e08fc6e20b3ce5c7ff77cf56a6
2021-04-23 18:22:48 +01:00
satayev
38fc61bbf0
Re-generated allow-deps.txt.
...
This is a merged version of aosp, mainline-prod, and internal versions.
Make sure that the build passes on all three branches. Nothing was
manually removed.
Bug: 185209711
Test: run packages/modules/common/build/update-apex-allowed-deps.sh
Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
Merged-In: I09d28383d61fa6e08fc6e20b3ce5c7ff77cf56a6
2021-04-23 16:51:27 +00:00
satayev
9b8f9236a9
Re-generated allow-deps.txt.
...
This is a merged version of aosp, mainline-prod, and internal versions.
Make sure that the build passes on all three branches. Nothing was
manually removed.
Bug: 185209711
Test: run packages/modules/common/build/update-apex-allowed-deps.sh
Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
Merged-In: I09d28383d61fa6e08fc6e20b3ce5c7ff77cf56a6
2021-04-23 16:51:02 +00:00
satayev
7d36e910f7
resolve merge conflicts of ad750e09ed to sc-dev
...
Test: run packages/modules/common/build/update-apex-allowed-deps.sh
Bug: 185209711
Change-Id: I09d28383d61fa6e08fc6e20b3ce5c7ff77cf56a6
Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
2021-04-23 16:59:40 +01:00
satayev
fc3f50920c
Re-generated allow-deps.txt.
...
This is a merged version of aosp, mainline-prod, and internal versions.
Make sure that the build passes on all three branches. Nothing was
manually removed.
Bug: 185209711
Test: run packages/modules/common/build/update-apex-allowed-deps.sh
Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
2021-04-23 15:39:32 +01:00
satayev
ad750e09ed
Re-generated allow-deps.txt.
...
This is a merged version of aosp, mainline-prod, and internal versions.
Make sure that the build passes on all three branches. Nothing was
manually removed.
Bug: 185209711
Test: run packages/modules/common/build/update-apex-allowed-deps.sh
Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
2021-04-23 13:09:23 +01:00
Anton Hansson
64df5aef0a
Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: 38a15eefdb am: 4a7755e08a am: 632092bfa6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881
Change-Id: I591aff578c19c977c93466be1cb8512373028a6e
2021-04-23 12:02:25 +00:00
Anton Hansson
632092bfa6
Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: 38a15eefdb am: 4a7755e08a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881
Change-Id: Ie566238c6343d34925c6aa392b936f2327dd51bf
2021-04-23 11:41:56 +00:00
Anton Hansson
374be9d2ec
Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: 38a15eefdb am: b3811ba5a8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881
Change-Id: Ia614567d4cb0b036c9c908409160b7cd9213fbc2
2021-04-23 11:41:12 +00:00
Anton Hansson
4a7755e08a
Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: 38a15eefdb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881
Change-Id: I1c8a25bb65b1a1fd63dd07b21619e97d6dc82c24
2021-04-23 11:18:17 +00:00
Anton Hansson
b3811ba5a8
Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: 38a15eefdb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881
Change-Id: I047adf65e2cfb01288829e1b64297f671abb9a7d
2021-04-23 11:17:52 +00:00
Anton Hansson
38a15eefdb
Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881
Change-Id: Ie52a44570e3ef895d6358c16b382792e8b3406be
2021-04-23 10:56:28 +00:00
Anton Hansson
57097d42c1
Merge "Add build rules for updated SDK 30 android.jars"
2021-04-23 10:38:25 +00:00
Anton Hansson
63a12a7692
[automerger skipped] Merge "Remove service-connectivity from allowed_deps" am: 784775b56e -s ours am: a48d1db0aa -s ours am: 97b6f59bd7 -s ours am: 7a847bb142 -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/+/1671787
Change-Id: Iff088fcae8acc687f8f25664db36804aaa4a7a52
2021-04-23 09:59:57 +00:00
Anton Hansson
f341d86d2d
[automerger skipped] Merge "Remove service-connectivity from allowed_deps" am: 784775b56e -s ours am: a48d1db0aa -s ours am: 4d049abd55 -s ours am: 3f4366acc7 -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/+/1671787
Change-Id: I6666950386bf8a34d6001afb396794389d446ca7
2021-04-23 09:59:53 +00:00
Anton Hansson
7a847bb142
[automerger skipped] Merge "Remove service-connectivity from allowed_deps" am: 784775b56e -s ours am: a48d1db0aa -s ours am: 97b6f59bd7 -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/+/1671787
Change-Id: I89981b7b6efeaf0127f6ed0defcce932941a05c1
2021-04-23 09:48:53 +00:00
Anton Hansson
3f4366acc7
[automerger skipped] Merge "Remove service-connectivity from allowed_deps" am: 784775b56e -s ours am: a48d1db0aa -s ours am: 4d049abd55 -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/+/1671787
Change-Id: I721f17bbddfb53ab0ac8c4c988ee04bb41f62a4f
2021-04-23 09:39:21 +00:00
Anton Hansson
97b6f59bd7
[automerger skipped] Merge "Remove service-connectivity from allowed_deps" am: 784775b56e -s ours am: a48d1db0aa -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/+/1671787
Change-Id: I5f06ee35c788b8ecc8f9dcf68e01b914fdd28db8
2021-04-23 09:19:53 +00:00
Anton Hansson
4d049abd55
[automerger skipped] Merge "Remove service-connectivity from allowed_deps" am: 784775b56e -s ours am: a48d1db0aa -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/+/1671787
Change-Id: I90cfb01ef7498db74865dbc3e91416ca3aa268a7
2021-04-23 09:19:50 +00:00
Anton Hansson
b95910d6a3
Merge "Remove service-connectivity from allowed_deps" into sc-dev am: f2e5c76490
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14124697
Change-Id: Id405c79f02200972e0a73249ecb888388f43e79c
2021-04-23 08:59:55 +00:00
Anton Hansson
a48d1db0aa
[automerger skipped] Merge "Remove service-connectivity from allowed_deps" am: 784775b56e -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/+/1671787
Change-Id: I3f9ee90304ec9b6908bb944973f16004c73c0a8d
2021-04-23 08:59:26 +00:00
Anton Hansson
f2e5c76490
Merge "Remove service-connectivity from allowed_deps" into sc-dev
2021-04-23 08:36:14 +00:00
Anton Hansson
784775b56e
Merge "Remove service-connectivity from allowed_deps"
2021-04-23 08:35:17 +00:00
Anton Hansson
8eb42eecbf
Add build rules for updated SDK 30 android.jars
...
These build rules are work-in-progress libraries to produce SDK jars
based on SDK 30 but with updated mainline module stubs.
They aren't yet ready to be used, as some of the components need
tweaking (for example, the android-non-updatable prebuilt does not
have resources in it)
Migrate in the android.jar defaults from frameworks/base to avoid taking
a dependency on that repository.
Bug: 184839225
Test: m android_30_modules_current{,_system}
Change-Id: Ie696406c57f437c9c46d727311ff2956b2c8c4ea
2021-04-22 18:39:53 +01:00
Elliott Hughes
1104517b2c
Add libgtest_prod_headers... am: 74ce74c645 am: bd18c4e953 am: 8b60c00cb0 am: e90249fb8a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1683465
Change-Id: I6e5140f51e4f7e418afa0c6ef99efc81f8103523
2021-04-22 14:08:13 +00:00
Elliott Hughes
5110fff6cb
Add libgtest_prod_headers... am: 74ce74c645 am: bd18c4e953 am: 0bb49380dd am: d1e02b71f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1683465
Change-Id: I54c762de713a3cf15d74b4d43e1c7047a9e0b92c
2021-04-22 14:07:42 +00:00
Elliott Hughes
e90249fb8a
Add libgtest_prod_headers... am: 74ce74c645 am: bd18c4e953 am: 8b60c00cb0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1683465
Change-Id: I443e4f36b63d23c47895b2d9b30bddd99f18845c
2021-04-22 13:45:17 +00:00