commit b5794a6096a0ffc45065101ba359880f71168be3
author Roshan Pius <rpius@google.com> Thu Jan 11 12:16:40 2024 -0800
committer Roshan Pius <rpius@google.com> Fri Jan 12 03:46:17 2024 +0000
tree bbee6ff0b333c68b687c1792f24adb8221bb3bd3
parent de0a2c47604ef379812e416336e1bbb31d8b4cc6

aconfig(flags): Make NFC dependencies available for nfc apex

Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
Change-Id: I17f75a14c0b625c1c19d51ea142f319df4180cd6

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index de1a0d7..7151f0cc 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -481,8 +481,8 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.permission",
+        "com.android.nfcservices",
     ],
-
 }
 
 // SQLite
@@ -744,6 +744,11 @@
 java_aconfig_library {
     name: "android.service.chooser.flags-aconfig-java",
     aconfig_declarations: "android.service.chooser.flags-aconfig",
+    min_sdk_version: "34",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.nfcservices",
+    ],
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }