Use framework-tethering-stub instead of framework-tethering
The non-updatable part of the platform now is built with
framework-tethering-stub, which is a stub library of
framework-tethering.
Bug: 147200698
Test: m
Change-Id: I97ef83f7f9b4c1376f373713036f5256318f1050
Merged-In: I97ef83f7f9b4c1376f373713036f5256318f1050
diff --git a/Android.bp b/Android.bp
index 79a8a4b..bc049a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -396,7 +396,6 @@
"ext",
"unsupportedappusage",
"updatable_media_stubs",
- "framework-tethering",
],
jarjar_rules: ":framework-jarjar-rules",
@@ -455,7 +454,10 @@
name: "framework-minus-apex",
defaults: ["framework-defaults"],
srcs: [":framework-non-updatable-sources"],
- libs: ["ike-stubs"],
+ libs: [
+ "ike-stubs",
+ "framework-tethering-stubs",
+ ],
installable: true,
javac_shard_size: 150,
required: [
@@ -471,6 +473,10 @@
// For backwards compatibility.
stem: "framework",
apex_available: ["//apex_available:platform"],
+ visibility: [
+ // TODO(b/147128803) remove the below lines
+ "//frameworks/base/packages/Tethering/tests/unit",
+ ],
}
// This "framework" module is NOT installed to the device. It's
@@ -490,9 +496,8 @@
"framework-minus-apex",
"updatable_media_stubs",
"framework-sdkextensions-stubs-systemapi",
- // TODO(b/147200698): should be the stub of framework-tethering
- "framework-tethering",
"ike-stubs",
+ "framework-tethering-stubs",
],
sdk_version: "core_platform",
apex_available: ["//apex_available:platform"],