diff options
| author | 2020-03-30 14:15:42 +0000 | |
|---|---|---|
| committer | 2020-03-30 14:15:42 +0000 | |
| commit | b4580f6294398606ab5d6f584112122e0217cfcc (patch) | |
| tree | f1fc03168ad5e041b0179999eb6f0d1888f1981e | |
| parent | 2ec47eeb7c6375d87438ede3cc100085cb890bc5 (diff) | |
| parent | add438f66c9fe16ef894319b463cb3e3b92cf4e0 (diff) | |
Merge "Build tethering against the module SDK"
| -rw-r--r-- | packages/Tethering/Android.bp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp index 0c372351292c..0cfd8843c0f8 100644 --- a/packages/Tethering/Android.bp +++ b/packages/Tethering/Android.bp @@ -16,9 +16,7 @@ java_defaults { name: "TetheringAndroidLibraryDefaults", - // TODO (b/146757305): change to module API once available - // TODO (b/148190005): change to module-libs-api-stubs-current once it is ready. - sdk_version: "core_platform", + sdk_version: "module_current", srcs: [ "src/**/*.java", ":framework-tethering-shared-srcs", @@ -35,15 +33,8 @@ java_defaults { "net-utils-framework-common", ], libs: [ - // Order matters: framework-tethering needs to be before the system stubs, otherwise - // hidden fields in the framework-tethering classes (which are also used to generate stubs) - // will not be found. "framework-tethering", - "android_system_stubs_current", - "framework-res", "unsupportedappusage", - "android_system_stubs_current", - "framework-res", ], plugins: ["java_api_finder"], manifest: "AndroidManifestBase.xml", @@ -91,9 +82,7 @@ cc_library { // Common defaults for compiling the actual APK. java_defaults { name: "TetheringAppDefaults", - // TODO (b/146757305): change to module API once available - // TODO (b/148190005): change to module-libs-api-stubs-current once it is ready. - sdk_version: "core_platform", + sdk_version: "module_current", privileged: true, jni_libs: [ "libtetherutilsjni", @@ -102,12 +91,7 @@ java_defaults { "res", ], libs: [ - // Order matters: framework-tethering needs to be before the system stubs, otherwise - // hidden fields in the framework-tethering classes (which are also used to generate stubs) - // will not be found. "framework-tethering", - "android_system_stubs_current", - "framework-res", ], jarjar_rules: "jarjar-rules.txt", optimize: { |