diff options
author | Roshan Pius <rpius@google.com> | 2023-12-07 10:54:05 -0800 |
---|---|---|
committer | Roshan Pius <rpius@google.com> | 2024-01-12 10:28:02 -0800 |
commit | 96dac95fc12332513bacf2047758df53ff1acbf2 (patch) | |
tree | 3c1887a0f8c5406c19dd984e25be9f22e8d9755e /api | |
parent | f766981533742c4b46b7d3a491ecc9baeac01f6b (diff) | |
download | base-96dac95fc12332513bacf2047758df53ff1acbf2.tar.gz |
framework-nfc: Switch to "framework-module-defaults"
Now that all the @hide usage of NFC API's from rest of platform is
cleaned out, we can now switch to the module defaults and continue the
separation of NFC API classes.
Bug: 303286040
Test: Compiles
Merged-In: I8bd5e38b1482600594c41660d14537cf15b48318
Change-Id: I8bd5e38b1482600594c41660d14537cf15b48318
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 d7e25834905c..62f0b6e9a2e0 100644 --- a/api/ApiDocs.bp +++ b/api/ApiDocs.bp @@ -51,6 +51,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 |