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

Commit b5f6cf1c authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Automerger Merge Worker
Browse files

Merge "Moving over core/api/*txt files" am: d93ed004 am: d2c48ad2 

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

Change-Id: I5a83a5def064d09a34d62460afa0ef3c5cc424b4
parents e37bdf52 d2c48ad2

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ filegroup { 
        // Java/AIDL sources under frameworks/base

        ":framework-annotations",

        ":framework-blobstore-sources",

        ":framework-bluetooth-sources", // TODO(b/214988855) : Remove once framework-bluetooth jar is ready

        ":framework-connectivity-tiramisu-sources",

        ":framework-core-sources",

        ":framework-drm-sources",
@@ -273,6 +272,7 @@ java_defaults { 
    defaults: ["framework-aidl-export-defaults"],

    srcs: [

        ":framework-non-updatable-sources",

        ":framework-bluetooth-sources", // TODO(b/214988855) : Remove once framework-bluetooth jar is ready

        "core/java/**/*.logtags",

        ":apex-info-list",

    ],
@@ -568,6 +568,7 @@ stubs_defaults { 
    libs: [

        "art.module.public.api",

        "sdk_module-lib_current_framework-tethering",

        "sdk_public_current_framework-bluetooth",

        // There are a few classes from modules used by the core that

        // need to be resolved by metalava. We use a prebuilt stub of the

        // full sdk to ensure we can resolve them. If a new class gets added,

ApiDocs.bp

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ stubs_defaults { 


        ":framework-appsearch-sources",

        ":framework-connectivity-sources",

        ":framework-bluetooth-sources",

        ":framework-connectivity-tiramisu-updatable-sources",

        ":framework-graphics-srcs",

        ":framework-mediaprovider-sources",

StubLibraries.bp

+4 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ modules_public_stubs = [ 
    "art.module.public.api.stubs",

    "conscrypt.module.public.api.stubs",

    "framework-appsearch.stubs",

    "framework-bluetooth.stubs",

    "framework-connectivity.stubs",

    "framework-connectivity-tiramisu.stubs",

    "framework-graphics.stubs",
@@ -232,6 +233,7 @@ modules_system_stubs = [ 
    "art.module.public.api.stubs.system",

    "conscrypt.module.public.api.stubs", // Only has public stubs

    "framework-appsearch.stubs.system",

    "framework-bluetooth.stubs.system",

    "framework-connectivity.stubs.system",

    "framework-connectivity-tiramisu.stubs.system",

    "framework-graphics.stubs.system",
@@ -290,6 +292,8 @@ java_library { 
    srcs: [":module-lib-api-stubs-docs-non-updatable"],

    libs: [

        "sdk_module-lib_current_framework-tethering",

        "sdk_public_current_framework-bluetooth",

        // NOTE: The below can be removed once the prebuilt stub contains bluetooth.

        "sdk_system_current_android",

        // NOTE: The below can be removed once the prebuilt stub contains IKE.

        "sdk_system_current_android.net.ipsec.ike",

api/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ combined_apis { 
        "art.module.public.api",

        "conscrypt.module.public.api",

        "framework-appsearch",

        "framework-bluetooth",

        "framework-connectivity",

        "framework-connectivity-tiramisu",

        "framework-graphics",

core/api/current.txt

+0 −1353

File changed.

Preview size limit exceeded, changes collapsed.