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

Revert submission 3411958-framework-nfc-code-split

Reason for revert: Causing a lot of merge conflicts down the chain because of missing changes in aosp/main.

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


Bug: 384067476
Change-Id: Ic451b2f5ebd80f875bc2c46c6a17516dc81dfd16
Test: Compiles

13 files changed, 20 insertions, 36 deletions

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index e40b6bde28a2..f69fd55beb3a 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -272,7 +272,7 @@ aconfig_declarations {
     name: "android.nfc.flags-aconfig",
     package: "android.nfc",
     container: "system",
-    srcs: ["nfc-non-updatable/flags/*.aconfig"],
+    srcs: ["nfc/java/android/nfc/*.aconfig"],
 }
 
 cc_aconfig_library {
diff --git a/nfc-non-updatable/Android.bp b/nfc-non-updatable/Android.bp
deleted file mode 100644
index ff987bb84b17..000000000000
--- a/nfc-non-updatable/Android.bp
+++ /dev/null
@@ -1,23 +0,0 @@
-package {
-    default_team: "trendy_team_fwk_nfc",
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_base_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_base_license"],
-}
-
-filegroup {
-    name: "framework-nfc-non-updatable-sources",
-    path: "java",
-    srcs: [
-        "java/android/nfc/NfcServiceManager.java",
-        "java/android/nfc/cardemulation/ApduServiceInfo.aidl",
-        "java/android/nfc/cardemulation/ApduServiceInfo.java",
-        "java/android/nfc/cardemulation/NfcFServiceInfo.aidl",
-        "java/android/nfc/cardemulation/NfcFServiceInfo.java",
-        "java/android/nfc/cardemulation/AidGroup.aidl",
-        "java/android/nfc/cardemulation/AidGroup.java",
-    ],
-}
diff --git a/nfc-non-updatable/OWNERS b/nfc-non-updatable/OWNERS
deleted file mode 100644
index f46dccd97974..000000000000
--- a/nfc-non-updatable/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
\ No newline at end of file
diff --git a/nfc/Android.bp b/nfc/Android.bp
index ff9588fb389b..c33665aef41d 100644
--- a/nfc/Android.bp
+++ b/nfc/Android.bp
@@ -9,12 +9,29 @@ package {
 }
 
 filegroup {
+    name: "framework-nfc-non-updatable-sources",
+    path: "java",
+    srcs: [
+        "java/android/nfc/NfcServiceManager.java",
+        "java/android/nfc/cardemulation/ApduServiceInfo.aidl",
+        "java/android/nfc/cardemulation/ApduServiceInfo.java",
+        "java/android/nfc/cardemulation/NfcFServiceInfo.aidl",
+        "java/android/nfc/cardemulation/NfcFServiceInfo.java",
+        "java/android/nfc/cardemulation/AidGroup.aidl",
+        "java/android/nfc/cardemulation/AidGroup.java",
+    ],
+}
+
+filegroup {
     name: "framework-nfc-updatable-sources",
     path: "java",
     srcs: [
         "java/**/*.java",
         "java/**/*.aidl",
     ],
+    exclude_srcs: [
+        ":framework-nfc-non-updatable-sources",
+    ],
 }
 
 java_sdk_library {
diff --git a/nfc-non-updatable/java/android/nfc/NfcServiceManager.java b/nfc/java/android/nfc/NfcServiceManager.java
index 5582f1154cad..5582f1154cad 100644
--- a/nfc-non-updatable/java/android/nfc/NfcServiceManager.java
+++ b/nfc/java/android/nfc/NfcServiceManager.java
diff --git a/nfc-non-updatable/java/android/nfc/cardemulation/AidGroup.aidl b/nfc/java/android/nfc/cardemulation/AidGroup.aidl
index 56d6fa559677..56d6fa559677 100644
--- a/nfc-non-updatable/java/android/nfc/cardemulation/AidGroup.aidl
+++ b/nfc/java/android/nfc/cardemulation/AidGroup.aidl
diff --git a/nfc-non-updatable/java/android/nfc/cardemulation/AidGroup.java b/nfc/java/android/nfc/cardemulation/AidGroup.java
index ae3e333051d7..ae3e333051d7 100644
--- a/nfc-non-updatable/java/android/nfc/cardemulation/AidGroup.java
+++ b/nfc/java/android/nfc/cardemulation/AidGroup.java
diff --git a/nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.aidl b/nfc/java/android/nfc/cardemulation/ApduServiceInfo.aidl
index a62fdd6a6c5c..a62fdd6a6c5c 100644
--- a/nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.aidl
+++ b/nfc/java/android/nfc/cardemulation/ApduServiceInfo.aidl
diff --git a/nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java b/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java
index eac783628ed9..eac783628ed9 100644
--- a/nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java
+++ b/nfc/java/android/nfc/cardemulation/ApduServiceInfo.java
diff --git a/nfc-non-updatable/java/android/nfc/cardemulation/NfcFServiceInfo.aidl b/nfc/java/android/nfc/cardemulation/NfcFServiceInfo.aidl
index 56b98ebd90fa..56b98ebd90fa 100644
--- a/nfc-non-updatable/java/android/nfc/cardemulation/NfcFServiceInfo.aidl
+++ b/nfc/java/android/nfc/cardemulation/NfcFServiceInfo.aidl
diff --git a/nfc-non-updatable/java/android/nfc/cardemulation/NfcFServiceInfo.java b/nfc/java/android/nfc/cardemulation/NfcFServiceInfo.java
index 33bc16978721..33bc16978721 100644
--- a/nfc-non-updatable/java/android/nfc/cardemulation/NfcFServiceInfo.java
+++ b/nfc/java/android/nfc/cardemulation/NfcFServiceInfo.java
diff --git a/nfc-non-updatable/flags/flags.aconfig b/nfc/java/android/nfc/flags.aconfig
index ee287aba709f..ee287aba709f 100644
--- a/nfc-non-updatable/flags/flags.aconfig
+++ b/nfc/java/android/nfc/flags.aconfig
diff --git a/nfc/tests/Android.bp b/nfc/tests/Android.bp
index 17fb810c626b..b6090e853158 100644
--- a/nfc/tests/Android.bp
+++ b/nfc/tests/Android.bp
@@ -29,6 +29,7 @@ android_test {
         "androidx.test.rules",
         "androidx.test.runner",
         "androidx.test.ext.junit",
+        "framework-nfc.impl",
         "mockito-target-extended-minus-junit4",
         "frameworks-base-testutils",
         "truth",
@@ -39,25 +40,16 @@ android_test {
         "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",
-        ":framework-nfc-updatable-sources",
-        ":framework-nfc-non-updatable-sources",
-    ],
+    srcs: ["src/**/*.java"],
     platform_apis: true,
     certificate: "platform",
     test_suites: [