diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | api/ApiDocs.bp | 1 | ||||
| -rw-r--r-- | api/StubLibraries.bp | 1 | ||||
| -rw-r--r-- | api/api.go | 3 | ||||
| -rw-r--r-- | nfc/Android.bp | 16 |
5 files changed, 10 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp index f3b2ebb4fc17..353234a89da3 100644 --- a/Android.bp +++ b/Android.bp @@ -437,7 +437,6 @@ java_library { name: "framework-non-updatable-unbundled-impl-libs", static_libs: [ "framework-location.impl", - "framework-nfc.impl", ], sdk_version: "core_platform", installable: false, diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp index bcfb68ffd04d..c314d907ca04 100644 --- a/api/ApiDocs.bp +++ b/api/ApiDocs.bp @@ -63,6 +63,7 @@ stubs_defaults { ":framework-graphics-srcs", ":framework-mediaprovider-sources", ":framework-nearby-sources", + ":framework-nfc-updatable-sources", ":framework-ondevicepersonalization-sources", ":framework-permission-sources", ":framework-permission-s-sources", diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index ef1fa6097056..74344cd4b5a5 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -635,7 +635,6 @@ java_defaults { api_contributions: [ "framework-virtualization.stubs.source.test.api.contribution", "framework-location.stubs.source.test.api.contribution", - "framework-nfc.stubs.source.test.api.contribution", ], } diff --git a/api/api.go b/api/api.go index 2668999c572e..993370a7656f 100644 --- a/api/api.go +++ b/api/api.go @@ -31,7 +31,6 @@ const conscrypt = "conscrypt.module.public.api" const i18n = "i18n.module.public.api" const virtualization = "framework-virtualization" const location = "framework-location" -const nfc = "framework-nfc" var core_libraries_modules = []string{art, conscrypt, i18n} @@ -43,7 +42,7 @@ var core_libraries_modules = []string{art, conscrypt, i18n} // APIs. // In addition, the modules in this list are allowed to contribute to test APIs // stubs. -var non_updatable_modules = []string{virtualization, location, nfc} +var non_updatable_modules = []string{virtualization, location} // The intention behind this soong plugin is to generate a number of "merged" // API-related modules that would otherwise require a large amount of very diff --git a/nfc/Android.bp b/nfc/Android.bp index bf9f47ceb0a7..43333745ba12 100644 --- a/nfc/Android.bp +++ b/nfc/Android.bp @@ -33,7 +33,14 @@ java_sdk_library { srcs: [ ":framework-nfc-updatable-sources", ], - defaults: ["framework-non-updatable-unbundled-defaults"], + defaults: ["framework-module-defaults"], + sdk_version: "module_current", + min_sdk_version: "VanillaIceCream", + installable: true, + optimize: { + enabled: false, + }, + hostdex: true, // for hiddenapi check permitted_packages: [ "android.nfc", "com.android.nfc", @@ -41,11 +48,4 @@ java_sdk_library { hidden_api_packages: [ "com.android.nfc", ], - aidl: { - include_dirs: [ - // TODO (b/303286040): Remove these when we change to |framework-module-defaults| - "frameworks/base/nfc/java", - "frameworks/base/core/java", - ], - }, } |