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

Merge "Run R8 with the necessary classpath classes"

Browse Source
This commit is contained in:
Treehugger Robot
2022-07-26 03:20:34 +00:00
committed by Gerrit Code Review
parent c34c21c624 371e7f7555
commit 3a317cc0c4
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework-t/Android.bp
View File

@@ -116,6 +116,7 @@ java_sdk_library {
"//packages/modules/Connectivity/Tethering/apex", "//packages/modules/Connectivity/Tethering/apex",
// In preparation for future move // In preparation for future move
"//packages/modules/Connectivity/apex", "//packages/modules/Connectivity/apex",
"//packages/modules/Connectivity/service", // For R8 only
"//packages/modules/Connectivity/service-t", "//packages/modules/Connectivity/service-t",
"//packages/modules/Nearby/service", "//packages/modules/Nearby/service",
"//frameworks/base", "//frameworks/base",

17
service/Android.bp
View File

@@ -225,12 +225,27 @@ java_defaults {
// This library combines system server jars that have access to different bootclasspath jars. // This library combines system server jars that have access to different bootclasspath jars.
// Lower SDK service jars must not depend on higher SDK jars as that would let them // Lower SDK service jars must not depend on higher SDK jars as that would let them
// transitively depend on the wrong bootclasspath jars. Sources also cannot be added here as // transitively depend on the wrong bootclasspath jars. Sources also cannot be added here as
// they would transitively depend on bootclasspath jars that may not be available. // they would depend on bootclasspath jars that may not be available.
static_libs: [ static_libs: [
"service-connectivity-pre-jarjar", "service-connectivity-pre-jarjar",
"service-connectivity-tiramisu-pre-jarjar", "service-connectivity-tiramisu-pre-jarjar",
"service-nearby-pre-jarjar", "service-nearby-pre-jarjar",
], ],
// The below libraries are not actually needed to build since no source is compiled
// (only combining prebuilt static_libs), but they are necessary so that R8 has the right
// references to optimize the code. Without these, there will be missing class warnings and
// code may be wrongly optimized.
// R8 runs after jarjar, so the framework-X libraries need to be the post-jarjar artifacts
// (.impl), if they are not just stubs, so that the name of jarjared classes match.
libs: [
"androidx.annotation_annotation",
"framework-annotations-lib",
"framework-connectivity.impl",
"framework-connectivity-t.impl",
"framework-tethering.stubs.module_lib",
"framework-wifi.stubs.module_lib",
"libprotobuf-java-nano",
],
jarjar_rules: ":connectivity-jarjar-rules", jarjar_rules: ":connectivity-jarjar-rules",
apex_available: [ apex_available: [
"com.android.tethering", "com.android.tethering",