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

Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b

Browse Source 
Original change: undetermined

Change-Id: Ia56347e16ba637bbd4e23cfa664a7b78fe4aa52f
This commit is contained in:
Paul Duffin
2020-06-02 11:58:45 +00:00
committed by Automerger Merge Worker
parent 408914d348 6812c1b1ee
commit 23926cc12a
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tethering/Android.bp
View File

@@ -34,7 +34,7 @@ java_defaults {
], ],
libs: [ libs: [
"framework-tethering.impl", "framework-tethering.impl",
"framework-wifi-stubs-systemapi", "framework-wifi",
"unsupportedappusage", "unsupportedappusage",
], ],
plugins: ["java_api_finder"], plugins: ["java_api_finder"],

5
Tethering/common/TetheringLib/Android.bp
View File

@@ -30,11 +30,6 @@ java_sdk_library {
":framework-tethering-srcs", ":framework-tethering-srcs",
], ],
// TODO(b/155480189) - Remove naming_scheme once references have been resolved.
// Temporary java_sdk_library component naming scheme to use to ease the transition from separate
// modules to java_sdk_library.
naming_scheme: "framework-modules",
jarjar_rules: "jarjar-rules.txt", jarjar_rules: "jarjar-rules.txt",
installable: true, installable: true,

2
Tethering/tests/unit/Android.bp
View File

@@ -60,7 +60,7 @@ java_defaults {
"framework-minus-apex", "framework-minus-apex",
"framework-res", "framework-res",
"framework-tethering.impl", "framework-tethering.impl",
"framework-wifi-stubs-module_libs_api", "framework-wifi.stubs.module_lib",
], ],
jni_libs: [ jni_libs: [
// For mockito extended // For mockito extended