commit 24106379a58f1bc2d06a7770a88bcdcc42b3edf2
author Roshan Pius <rpius@google.com> Fri Dec 13 17:19:03 2024 -0800
committer Roshan Pius <rpius@google.com> Fri Dec 13 21:06:29 2024 -0800
tree 8c227b0fc4bb71b61205e959596c138484bd890a
parent 2daef7f6cf3ab06149a0fd6aa63b06554c9c4e60

Revert "Revert "nfc(framework): Split non-updatable portion to a..."

Revert submission 3414164-revert-3411958-framework-nfc-code-split-TOOKKZAIEM

Reason for revert: Reland with some missing changes from aosp/main merged to avoid automerger conflicts.

Reverted changes: /q/submissionid:3414164-revert-3411958-framework-nfc-code-split-TOOKKZAIEM

Bug: 367426693 
Change-Id: I620692a29e21d4a1d1083521894a4731648bbc3f
Test: Compiles

nfc/tests/Android.bp

diff --git a/nfc/tests/Android.bp b/nfc/tests/Android.bp
index b6090e8..17fb810 100644
--- a/nfc/tests/Android.bp
+++ b/nfc/tests/Android.bp
@@ -29,7 +29,6 @@
         "androidx.test.rules",
         "androidx.test.runner",
         "androidx.test.ext.junit",
-        "framework-nfc.impl",
         "mockito-target-extended-minus-junit4",
         "frameworks-base-testutils",
         "truth",
@@ -40,16 +39,25 @@
         "testables",
     ],
     libs: [
+        "androidx.annotation_annotation",
+        "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
+        "framework-permission-s.stubs.module_lib",
+        "framework-permission.stubs.module_lib",
         "android.test.base.stubs.system",
         "android.test.mock.stubs.system",
         "android.test.runner.stubs.system",
+        "framework-nfc.impl",
     ],
     jni_libs: [
         // Required for ExtendedMockito
         "libdexmakerjvmtiagent",
         "libstaticjvmtiagent",
     ],
-    srcs: ["src/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+        ":framework-nfc-updatable-sources",
+        ":framework-nfc-non-updatable-sources",
+    ],
     platform_apis: true,
     certificate: "platform",
     test_suites: [