LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Only use framework-connectivity stubs for -t stubs"

Browse Source
This commit is contained in:
Treehugger Robot
2022-08-04 04:34:17 +00:00
committed by Gerrit Code Review
parent 31b48fa787 77d4c4efa8
commit a9fa050bdc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework-t/Android.bp
View File

@@ -43,14 +43,9 @@ java_defaults {
":framework-connectivity-tiramisu-updatable-sources", ":framework-connectivity-tiramisu-updatable-sources",
":framework-nearby-java-sources", ":framework-nearby-java-sources",
], ],
stub_only_libs: [
// Use prebuilt framework-connectivity stubs to avoid circular dependencies
"sdk_module-lib_current_framework-connectivity",
],
libs: [ libs: [
"unsupportedappusage", "unsupportedappusage",
"app-compat-annotations", "app-compat-annotations",
"sdk_module-lib_current_framework-connectivity",
], ],
impl_only_libs: [ impl_only_libs: [
// The build system will use framework-bluetooth module_current stubs, because // The build system will use framework-bluetooth module_current stubs, because
@@ -104,6 +99,13 @@ java_sdk_library {
// The jarjar rules are only so that references to jarjared utils in // The jarjar rules are only so that references to jarjared utils in
// framework-connectivity-pre-jarjar match at runtime. // framework-connectivity-pre-jarjar match at runtime.
jarjar_rules: ":framework-connectivity-jarjar-rules", jarjar_rules: ":framework-connectivity-jarjar-rules",
stub_only_libs: [
// Use prebuilt framework-connectivity stubs to avoid circular dependencies
"sdk_module-lib_current_framework-connectivity",
],
libs: [
"sdk_module-lib_current_framework-connectivity",
],
permitted_packages: [ permitted_packages: [
"android.app.usage", "android.app.usage",
"android.net", "android.net",