commit 6852b4e6d418d20053222d870ef916d73d29c986
author Roshan Pius <rpius@google.com> Wed Dec 11 11:56:55 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 11 11:56:55 2024 -0800
tree 4b3aa9318b1d576447af117e7102bc190e522ac7
parent db250fbeb776e73d27ac6e718c1b54e9e2d60b77
parent 6d2eb71d86940aa15249cbc28685ca0daf48b232

Merge "nfc(api): Prepare for NFC codebase move" into main

nfc/Android.bp

diff --git a/nfc/Android.bp b/nfc/Android.bp
index abe0ab7..b82dec8 100644
--- a/nfc/Android.bp
+++ b/nfc/Android.bp
@@ -71,6 +71,7 @@
         "//cts/hostsidetests/multidevices/nfc:__subpackages__",
         "//cts/tests/tests/nfc",
         "//packages/apps/Nfc:__subpackages__",
+        "//packages/modules/Nfc:__subpackages__",
     ],
     jarjar_rules: ":nfc-jarjar-rules",
     lint: {

nfc/OWNERS

diff --git a/nfc/OWNERS b/nfc/OWNERS
index 35e9713..f46dccd 100644
--- a/nfc/OWNERS
+++ b/nfc/OWNERS
@@ -1,2 +1,2 @@
 # Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
+include platform/packages/apps/Nfc:/OWNERS
\ No newline at end of file

nfc/java/android/nfc/cardemulation/OWNERS

diff --git a/nfc/java/android/nfc/cardemulation/OWNERS b/nfc/java/android/nfc/cardemulation/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/nfc/java/android/nfc/cardemulation/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS

nfc/java/android/nfc/dta/OWNERS

diff --git a/nfc/java/android/nfc/dta/OWNERS b/nfc/java/android/nfc/dta/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/nfc/java/android/nfc/dta/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS

nfc/java/android/nfc/tech/OWNERS

diff --git a/nfc/java/android/nfc/tech/OWNERS b/nfc/java/android/nfc/tech/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/nfc/java/android/nfc/tech/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS