Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a68aac58 authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3406084



Change-Id: Ia33ce6b7faab1d1bc6fc5d7b8448aee11f739cc1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d71f81e 6852b4e6

nfc/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ java_sdk_library { 
        "//cts/hostsidetests/multidevices/nfc:__subpackages__",

        "//cts/tests/tests/nfc",

        "//packages/apps/Nfc:__subpackages__",

        "//packages/modules/Nfc:__subpackages__",

    ],

    jarjar_rules: ":nfc-jarjar-rules",

    lint: {

nfc/java/android/nfc/cardemulation/OWNERS

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# Bug component: 48448

include platform/packages/apps/Nfc:/OWNERS

nfc/java/android/nfc/dta/OWNERS

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# Bug component: 48448

include platform/packages/apps/Nfc:/OWNERS

nfc/java/android/nfc/tech/OWNERS

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# Bug component: 48448

include platform/packages/apps/Nfc:/OWNERS

nfc/OWNERS

+1 −1

File changed.

Contains only whitespace changes.