Merge "Compile android-non-updatable with framework-tethering module-lib stub" am: 1176dd4409 am: 9a542a9799

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885796

Change-Id: If95edd50638d7ec100c654f859dff9e295907b11
This commit is contained in:
Mark Chien
2021-11-15 14:09:53 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 0 deletions

View File

@@ -563,6 +563,7 @@ stubs_defaults {
"android.hardware.vibrator-V1.3-java", "android.hardware.vibrator-V1.3-java",
"framework-protos", "framework-protos",
"art.module.public.api", "art.module.public.api",
"sdk_module-lib_current_framework-tethering",
// There are a few classes from modules used by the core that // There are a few classes from modules used by the core that
// need to be resolved by metalava. We use a prebuilt stub of the // need to be resolved by metalava. We use a prebuilt stub of the
// full sdk to ensure we can resolve them. If a new class gets added, // full sdk to ensure we can resolve them. If a new class gets added,

View File

@@ -318,6 +318,7 @@ java_library {
defaults: ["android-non-updatable_defaults_stubs_current"], defaults: ["android-non-updatable_defaults_stubs_current"],
srcs: [":module-lib-api-stubs-docs-non-updatable"], srcs: [":module-lib-api-stubs-docs-non-updatable"],
libs: [ libs: [
"sdk_module-lib_current_framework-tethering",
"sdk_system_current_android", "sdk_system_current_android",
// NOTE: The below can be removed once the prebuilt stub contains IKE. // NOTE: The below can be removed once the prebuilt stub contains IKE.
"sdk_system_current_android.net.ipsec.ike", "sdk_system_current_android.net.ipsec.ike",