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

Commit 19faae06 authored by Roshan Pius's avatar Roshan Pius Committed by Gerrit Code Review
Browse files

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
parent 132a431e

AconfigFlags.bp

+1 −1
Original line number Diff line number Diff line
@@ -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 {

nfc-non-updatable/Android.bp

deleted100644 → 0
+0 −23
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

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

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

nfc/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -8,6 +8,20 @@ package { 
    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",

    ],

}



filegroup {

    name: "framework-nfc-updatable-sources",

    path: "java",
@@ -15,6 +29,9 @@ filegroup { 
        "java/**/*.java",

        "java/**/*.aidl",

    ],

    exclude_srcs: [

        ":framework-nfc-non-updatable-sources",

    ],

}



java_sdk_library {