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

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

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

Merge "Revert "Revert "nfc(framework): Split non-updatable portion to a..."" into main am: f153bc11

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



Change-Id: I266e95378945f5f0c4a175aa1df9a549c51ec510
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8512cdd3 f153bc11

AconfigFlags.bp

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ aconfig_declarations { 
    name: "android.nfc.flags-aconfig",

    package: "android.nfc",

    container: "system",

    srcs: ["nfc/java/android/nfc/*.aconfig"],

    srcs: ["nfc-non-updatable/flags/*.aconfig"],

}



cc_aconfig_library {

nfc-non-updatable/Android.bp

0 → 100644
+23 −0
Original line number Diff line number Diff line 
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",

    ],

}

nfc-non-updatable/OWNERS

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

include platform/packages/apps/Nfc:/OWNERS
 
 No newline at end of file