diff options
| author | 2024-01-12 17:37:55 +0000 | |
|---|---|---|
| committer | 2024-01-12 17:37:55 +0000 | |
| commit | 9f2a7007bec7f09df1ea4757431fc20333778cec (patch) | |
| tree | 166c15a61cfe6bd2a28364587fabad2d62cfd501 /api | |
| parent | 26a91ad07238561bff7f1c87fc3a3add16f1a316 (diff) | |
| parent | 0f7fa6a23dec3284a96274880d59ee879c48532a (diff) | |
Merge changes from topic "framework-nfc-updatable" into main
* changes:
nfc(api): Move NFC API lint baseline
nfc(api): Move nfc classes to framework-nfc
framework-nfc: Switch to "framework-module-defaults"
Diffstat (limited to 'api')
| -rw-r--r-- | api/ApiDocs.bp | 1 | ||||
| -rw-r--r-- | api/StubLibraries.bp | 1 | ||||
| -rw-r--r-- | api/api.go | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/api/ApiDocs.bp b/api/ApiDocs.bp index 6b8c02f901f1..7ae3224e7500 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 43713aad0e1e..b975c55c5af9 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 |