Commit Graph

157 Commits

Author SHA1 Message Date
satayev
2fe45ad6bb Use absolute paths in classpaths.proto. am: 4239d7b57b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1711328

Change-Id: I6b913431ea3d9d4b93e1f621e35f559c285d376b
2021-05-19 09:36:55 +00:00
satayev
4239d7b57b Use absolute paths in classpaths.proto.
The intention before was to use relative paths to a partition where a
config is defined. However, jars in /system_ext partition are planned to
be declared in /system's classpaths.proto config.

Bug: 180105615
Test: atest derive_classpath_test
Change-Id: I4f955303631ba84b47d6e287c7b4f59c1e198da1
2021-05-18 19:32:02 +01:00
Ken Chen
b64d164044 Merge "Make netd_aidl_interface-V6-java available for connectivity" am: bb9ba93a7d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1686007

Change-Id: Ib3cb2192cfd0f5faf4b95f4d17f9770ab991ba19
2021-05-13 01:34:23 +00:00
Ken Chen
bb9ba93a7d Merge "Make netd_aidl_interface-V6-java available for connectivity" 2021-05-13 01:20:39 +00:00
Treehugger Robot
5c22d43292 Merge "Add SettingsLib libraries used by PermissionController to allowed_deps." am: 9f1f0d8423
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1702865

Change-Id: Ifeb6d09ea4a835ee374006e8582c61f2ab457bd1
2021-05-11 11:57:47 +00:00
Treehugger Robot
9f1f0d8423 Merge "Add SettingsLib libraries used by PermissionController to allowed_deps." 2021-05-11 11:20:36 +00:00
Treehugger Robot
7721d15f7d Merge "Add NetworkStackApi{Current/31}Shims with min_sdk 29 to allowed_deps" am: c94d4e4aac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1702493

Change-Id: I2cf639a255b770d6030b6d3039bb74c82b9a0771
2021-05-11 10:25:34 +00:00
Treehugger Robot
c94d4e4aac Merge "Add NetworkStackApi{Current/31}Shims with min_sdk 29 to allowed_deps" 2021-05-11 10:10:35 +00:00
satayev
3e3feab76e Move SdkExtensions/proto to packages/modules/common. am: 075d07c591
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1700071

Change-Id: I830b1efe740e30297f50c3c0b2fe8af78224a4cf
2021-05-11 10:04:24 +00:00
markchien
ceacecc1b3 Add NetworkStackApi{Current/31}Shims with min_sdk 29 to allowed_deps
They are used for Tethering and NetworkStack module

Bug: 182211575
Test: m

Change-Id: I6d7bcffa337d0c1e50b1883f68999d2ffdf09de8
2021-05-11 16:42:15 +08:00
Hai Zhang
7d435eee9c Add SettingsLib libraries used by PermissionController to allowed_deps.
We need to use these SettingsLib preferences in order to adapt to the
new Settings theme in S+.

The minSdkVersion:21 here is technically incorrect and should be 30
instead. This will be addressed in a future change that fixes it for all
SettingsLib libraries and cleans up the API Lint baseline text files as
well.

Bug: 14490549
Test: presubmit
Change-Id: Id19c89116251ab4e7ce23ec1f80e272d0d8ccb13
2021-05-11 07:38:44 +00:00
satayev
075d07c591 Move SdkExtensions/proto to packages/modules/common.
The proto definitions may be needed at build time to generate appropriate
configs for the modules. Unbundled ART branches do not include
packages/modules/SdkExtenstion in their manifest; so put the proto in a
project that should be visible to all unbundled modules.

Move any relevant tools to packages/modules/common/tools as well.

Bug: 180105615
Test: m nothing
Change-Id: I4efa4300553af6b321f46adb29b8cc90e4556955
2021-05-10 18:27:54 +01:00
Chang Li
2f325a1cdc Allowlist TextClassifierNotificationLibNoManifest sdk version 30. am: 4986e116e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689400

Change-Id: I3044aa38a0e56d5a828dfe46f9a5cfa6cd0709b3
2021-04-30 17:37:44 +00:00
Chang Li
4986e116e5 Allowlist TextClassifierNotificationLibNoManifest sdk version 30.
Change-Id: I625b4483f827be0666de7e0860db36ba47bb7b2d
2021-04-29 11:59:06 +01:00
Anton Hansson
2ef12995a3 Merge changes I9b0590b3,Ia9a6f19c am: cd130663dc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689777

Change-Id: Iaf648c9d6a6bc7c8d5a6e95dd17f7924b9195b9a
2021-04-29 08:57:09 +00:00
Anton Hansson
cd130663dc Merge changes I9b0590b3,Ia9a6f19c
* changes:
  Add androidx libs with min_sdk 30 to allowed_deps
  Add libunwind_llvm to allowed deps
2021-04-29 08:15:46 +00:00
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
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
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
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
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
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
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
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
bd18c4e953 Add libgtest_prod_headers... am: 74ce74c645
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1683465

Change-Id: I3ad1b8f3ab5457cc10314ab27c5b2fb8c1067f5c
2021-04-22 12:58:01 +00:00
Remi NGUYEN VAN
8296b49f17 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
Merged-In: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
Change-Id: I8de95d8b803146e4e6aee67e83306fbacc808312
2021-04-22 04:41:56 +00:00
Elliott Hughes
74ce74c645 Add libgtest_prod_headers...
...the new name for libgtest_prod (which we'll come back and removed
once we've switched everyone over to the new header_lib).

Bug: http://b/185916167
Test: treehugger
Change-Id: I09e22143f4b2a88754b3c8516c32c79fc74b8a24
2021-04-21 09:22:11 -07:00
Jiyong Park
6d90c69ecc Fix the min sdk version of the asm prebuilts am: 2138e70045
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1679006

Change-Id: Icd79df27af156c62e5e13ac12a88faac5128d4d7
2021-04-19 09:56:56 +00:00
Jiyong Park
2138e70045 Fix the min sdk version of the asm prebuilts
The build system now correctly recognizes the min sdk versino of the
prebuilts that don't have the sdk_version property set.

Bug: 185721733
Test: m on cf_x86_phone
Merged-In: Ib5dac532154dbce13630423f7a460f3b96e9af3a
Change-Id: Ib5dac532154dbce13630423f7a460f3b96e9af3a
(cherry picked from commit 29f3a570f2)
2021-04-19 17:47:48 +09:00
Treehugger Robot
c1c400d73a Merge "Fix the min sdk version of the kotlin prebuilts" am: aeaee3cdeb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675591

Change-Id: Ic412c98c6a5bde2a780926971d9722e6f63a1a57
2021-04-17 00:03:37 +00:00
Treehugger Robot
aeaee3cdeb Merge "Fix the min sdk version of the kotlin prebuilts" 2021-04-16 23:35:42 +00:00
Anton Hansson
68773c10c3 Merge "Move module defaults into a dedicated .bp file" am: e9c8f504cf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675880

Change-Id: I7a0e547f8e9e9e33dbef98d06cba9ab889dde780
2021-04-15 15:14:16 +00:00
Anton Hansson
e9c8f504cf Merge "Move module defaults into a dedicated .bp file" 2021-04-15 14:46:14 +00:00
Anton Hansson
4c708d2007 Merge "Add restrictive default visibility for module repo" am: 5eb632dec0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675879

Change-Id: I9159f02c216374ca42058657af5c7295b689a3be
2021-04-15 13:59:30 +00:00
Anton Hansson
5eb632dec0 Merge "Add restrictive default visibility for module repo" 2021-04-15 13:30:47 +00:00
Jiyong Park
4424a2cbb8 Fix the min sdk version of the kotlin prebuilts
The build system now correctly recognizes the min sdk versino of the
prebuilts that don't have the sdk_version property set.

Bug: 1663140
Test: m
Change-Id: I4078205a8b08c9dfe1bfb65017d9b1723b59b3da
2021-04-15 19:24:13 +09:00
Anton Hansson
807c08357a Move module defaults into a dedicated .bp file
I'm adding some other modules in a follow up, and to avoid creating
a large messy bp file, do some re-organization ahead of time.

Bug: 184839225
Bug: 185128417
Test: m
Change-Id: Icd655e680f7138582ddf34fb0e0e78e9bdd7a927
2021-04-14 19:07:15 +01:00
Anton Hansson
fb97572c29 Add restrictive default visibility for module repo
Avoid dependencies that the repo owners do not know about.

Test: m nothing
Change-Id: I9c24b33cd0dcd98850002d9ab86492f6175acf38
2021-04-14 19:06:08 +01: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
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
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
48b55f6094 Merge "Make libaidlcommonsupport available to apex modules" 2021-04-13 16:29:33 +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