Skip to content
Snippets Groups Projects
Commit 1a8d9d15 authored by Dan Stahr's avatar Dan Stahr Committed by Patrick Rohr
Browse files

Set up the jarjar config generator for the Tethering module.

This does not affect existing classes in framework-tethering.jar
as everything inside android.net is excluded from being jarjar'ed.
It is a preparatory step to adding cronet to framework-tethering.jar
which will use jarjar.

Test: m
Change-Id: I8cc7babaa37f7aef52306a833593dba097fd26db
parent 8043d5d7
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@ cronet_java_prejarjar_defaults = "CronetJavaPrejarjarDefaultsEnabled"
java_sdk_library {
name: "framework-tethering",
defaults: ["framework-module-defaults"],
defaults: ["framework-tethering-defaults"],
impl_library_visibility: [
"//packages/modules/Connectivity/Tethering:__subpackages__",
"//packages/modules/Connectivity/framework",
......@@ -57,24 +57,54 @@ java_sdk_library {
"//packages/modules/NetworkStack/tests:__subpackages__",
"//packages/modules/Wifi/service/tests/wifitests",
],
stub_only_libs: ["framework-connectivity.stubs.module_lib"],
jarjar_rules: ":framework-tethering-jarjar-rules",
installable: true,
srcs: [":framework-tethering-srcs"],
hostdex: true, // for hiddenapi check
permitted_packages: ["android.net"],
lint: { strict_updatability_linting: true },
}
java_library {
name: "framework-tethering-pre-jarjar",
defaults: ["framework-tethering-defaults"],
}
java_genrule {
name: "framework-tethering-jarjar-rules",
tool_files: [
":framework-tethering-pre-jarjar{.jar}",
":framework-tethering.stubs.module_lib{.jar}",
"jarjar-excludes.txt",
],
tools: [
"jarjar-rules-generator",
],
out: ["framework_tethering_jarjar_rules.txt"],
cmd: "$(location jarjar-rules-generator) " +
"$(location :framework-tethering-pre-jarjar{.jar}) " +
"--apistubs $(location :framework-tethering.stubs.module_lib{.jar}) " +
"--prefix android.net.http.internal " +
"--excludes $(location jarjar-excludes.txt) " +
"--output $(out)",
}
java_defaults {
name: "framework-tethering-defaults",
defaults: ["framework-module-defaults"],
srcs: [
":framework-tethering-srcs"
],
libs: ["framework-connectivity.stubs.module_lib"],
stub_only_libs: ["framework-connectivity.stubs.module_lib"],
aidl: {
include_dirs: [
"packages/modules/Connectivity/framework/aidl-export",
],
},
jarjar_rules: "jarjar-rules.txt",
installable: true,
hostdex: true, // for hiddenapi check
apex_available: ["com.android.tethering"],
permitted_packages: ["android.net"],
min_sdk_version: "30",
lint: { strict_updatability_linting: true },
}
filegroup {
......
# Don't touch anything that's already under android.net
android\.net\..+
\ No newline at end of file
# jarjar rules for the bootclasspath tethering framework library here
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment