Merge "Dexopt service-connectivity." into stage-aosp-master am: 78a1e45e95

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16521718

Change-Id: If75758c3134799baca694d133777454e9af0206f
This commit is contained in:
TreeHugger Robot
2021-12-23 04:32:56 +00:00
committed by Automerger Merge Worker
2 changed files with 9 additions and 2 deletions

View File

@@ -206,4 +206,5 @@ android_app {
sdk { sdk {
name: "tethering-module-sdk", name: "tethering-module-sdk",
bootclasspath_fragments: ["com.android.tethering-bootclasspath-fragment"], bootclasspath_fragments: ["com.android.tethering-bootclasspath-fragment"],
systemserverclasspath_fragments: ["com.android.tethering-systemserverclasspath-fragment"],
} }

View File

@@ -44,8 +44,8 @@ apex {
bootclasspath_fragments: [ bootclasspath_fragments: [
"com.android.tethering-bootclasspath-fragment", "com.android.tethering-bootclasspath-fragment",
], ],
java_libs: [ systemserverclasspath_fragments: [
"service-connectivity", "com.android.tethering-systemserverclasspath-fragment",
], ],
multilib: { multilib: {
first: { first: {
@@ -114,6 +114,12 @@ bootclasspath_fragment {
}, },
} }
systemserverclasspath_fragment {
name: "com.android.tethering-systemserverclasspath-fragment",
standalone_contents: ["service-connectivity"],
apex_available: ["com.android.tethering"],
}
override_apex { override_apex {
name: "com.android.tethering.inprocess", name: "com.android.tethering.inprocess",
base: "com.android.tethering", base: "com.android.tethering",