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
diff --git a/nfc/Android.bp b/nfc/Android.bp
index bf9f47c..4333374 100644
--- a/nfc/Android.bp
+++ b/nfc/Android.bp
@@ -33,7 +33,14 @@
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 @@
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",
- ],
- },
}