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

Commit 9f2a7007 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topic "framework-nfc-updatable" into main 

* changes:
  nfc(api): Move NFC API lint baseline
  nfc(api): Move nfc classes to framework-nfc
  framework-nfc: Switch to "framework-module-defaults"
parents 26a91ad0 0f7fa6a2

AconfigFlags.bp

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.nfc.flags-aconfig",

    package: "android.nfc",

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

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

}



cc_aconfig_library {
@@ -216,7 +216,7 @@ cc_aconfig_library { 
java_aconfig_library {

    name: "android.nfc.flags-aconfig-java",

    aconfig_declarations: "android.nfc.flags-aconfig",

    min_sdk_version: "VanillaIceCream",

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -431,7 +431,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
@@ -635,7 +635,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