commit c455419a4dc0af629a4f72a6e4eb8348c66b4480
author Ted Bauer <tedbauer@google.com> Wed Apr 24 00:54:07 2024 +0000
committer Ted Bauer <tedbauer@google.com> Mon Apr 29 22:23:52 2024 +0000
tree af39314b7d5848165fec01e951a2eeefd82b20f8
parent 8e2ebf6b39bcab5ac00928d40207261385e6093e

Add deps for new aconfig flagging storage

Aconfig flagging storage is migrating to a new underlying storage, which
has new dependencies. Add the dependencies as a defaults.

Bug: 328444881
Test: m
Change-Id: I79ac20c5937a0fa950caf5ef9015a6041200beea

NfcNci/nci/jni/Android.bp

diff --git a/NfcNci/nci/jni/Android.bp b/NfcNci/nci/jni/Android.bp
index 88d38a2..db8881c 100644
--- a/NfcNci/nci/jni/Android.bp
+++ b/NfcNci/nci/jni/Android.bp
@@ -55,11 +55,15 @@
         "libxml2",
     ],
 
+    defaults: [
+        "aconfig_lib_cc_static_link.defaults",
+    ],
+
     product_variables: {
         debuggable: {
             cflags: [
                 "-DDCHECK_ALWAYS_ON",
-                "-DDTA_ENABLED"
+                "-DDTA_ENABLED",
             ],
         },
     },
@@ -70,8 +74,8 @@
     },
     stl: "libc++_static",
     apex_available: [
-         "//apex_available:platform",
-         "com.android.nfcservices"
+        "//apex_available:platform",
+        "com.android.nfcservices",
     ],
     required: [
         // Provide a default libnfc-nci.conf in /system/etc for devices that
@@ -97,7 +101,7 @@
     ],
 
     header_libs: [
-        "jni_headers"
+        "jni_headers",
     ],
 
     include_dirs: [