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

Commit 5221496f authored by Roshan Pius's avatar Roshan Pius
Browse files

framework-nfc: Switch to "framework-module-defaults" am: 96dac95f 

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



Merged-In: I8bd5e38b1482600594c41660d14537cf15b48318
Change-Id: Ie96315990595f1405a1e8a4c7f184596dc3a572b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9b3c063 96dac95f

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ java_library { 
    name: "framework-non-updatable-unbundled-impl-libs",

    static_libs: [

        "framework-location.impl",

        "framework-nfc.impl",

    ],

    sdk_version: "core_platform",

    installable: false,

api/ApiDocs.bp

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ stubs_defaults { 
        ":framework-graphics-srcs",

        ":framework-mediaprovider-sources",

        ":framework-nearby-sources",

        ":framework-nfc-updatable-sources",

        ":framework-ondevicepersonalization-sources",

        ":framework-permission-sources",

        ":framework-permission-s-sources",

api/StubLibraries.bp

+0 −1
Original line number Diff line number Diff line
@@ -779,7 +779,6 @@ java_defaults { 
    api_contributions: [

        "framework-virtualization.stubs.source.test.api.contribution",

        "framework-location.stubs.source.test.api.contribution",

        "framework-nfc.stubs.source.test.api.contribution",

    ],

}

api/api.go

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ const conscrypt = "conscrypt.module.public.api" 
const i18n = "i18n.module.public.api"

const virtualization = "framework-virtualization"

const location = "framework-location"

const nfc = "framework-nfc"



var core_libraries_modules = []string{art, conscrypt, i18n}
@@ -43,7 +42,7 @@ var core_libraries_modules = []string{art, conscrypt, i18n} 
// APIs.

// In addition, the modules in this list are allowed to contribute to test APIs

// stubs.

var non_updatable_modules = []string{virtualization, location, nfc}

var non_updatable_modules = []string{virtualization, location}



// The intention behind this soong plugin is to generate a number of "merged"

// API-related modules that would otherwise require a large amount of very

nfc/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -33,7 +33,14 @@ java_sdk_library { 
    srcs: [

        ":framework-nfc-updatable-sources",

    ],

    defaults: ["framework-non-updatable-unbundled-defaults"],

    defaults: ["framework-module-defaults"],

    sdk_version: "module_current",

    min_sdk_version: "VanillaIceCream",

    installable: true,

    optimize: {

        enabled: false,

    },

    hostdex: true, // for hiddenapi check

    permitted_packages: [

        "android.nfc",

        "com.android.nfc",
@@ -41,11 +48,4 @@ java_sdk_library { 
    hidden_api_packages: [

        "com.android.nfc",

    ],

    aidl: {

        include_dirs: [

	    // TODO (b/303286040): Remove these when we change to |framework-module-defaults|

            "frameworks/base/nfc/java",

            "frameworks/base/core/java",

        ],

    },

}