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

Commit f31935f2 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Unbundle ART API from android-non-updatable" am: 5a4fc1d6 am: a81a5f1b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10733ea6a254c85ec624b271caa7dcfb05f72cc0
parents f8c208d0 a81a5f1b

StubLibraries.bp

+4 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ stubs_defaults { 
        "core/java/**/*.logtags",

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

        ":opt-telephony-srcs",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

        ":opt-net-voip-srcs",

        ":art.module.public.api{.public.stubs.source}",

        "**/package.html",

        "**/package.html",

    ],

    ],

    sdk_version: "none",

    sdk_version: "none",
@@ -240,6 +239,7 @@ java_library_static { 
    name: "android_stubs_current",

    name: "android_stubs_current",

    srcs: [ ":api-stubs-docs-non-updatable" ],

    srcs: [ ":api-stubs-docs-non-updatable" ],

    static_libs: [

    static_libs: [

        "art.module.public.api.stubs",

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

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

        "framework-media.stubs",

        "framework-media.stubs",

        "framework-mediaprovider.stubs",

        "framework-mediaprovider.stubs",
@@ -258,6 +258,7 @@ java_library_static { 
    name: "android_system_stubs_current",

    name: "android_system_stubs_current",

    srcs: [ ":system-api-stubs-docs-non-updatable" ],

    srcs: [ ":system-api-stubs-docs-non-updatable" ],

    static_libs: [

    static_libs: [

        "art.module.public.api.stubs",

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

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

        "framework-media.stubs.system",

        "framework-media.stubs.system",

        "framework-mediaprovider.stubs.system",

        "framework-mediaprovider.stubs.system",
@@ -292,6 +293,7 @@ java_library_static { 
    static_libs: [

    static_libs: [

        // Modules do not have test APIs, but we want to include their SystemApis, like we include

        // Modules do not have test APIs, but we want to include their SystemApis, like we include

        // the SystemApi of framework-non-updatable-sources.

        // the SystemApi of framework-non-updatable-sources.

        "art.module.public.api.stubs",

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

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

        "framework-media.stubs.system",

        "framework-media.stubs.system",

        "framework-mediaprovider.stubs.system",

        "framework-mediaprovider.stubs.system",
@@ -328,6 +330,7 @@ java_library_static { 
        "android_stubs_dists_default",

        "android_stubs_dists_default",

    ],

    ],

    libs: ["sdk_system_29_android"],

    libs: ["sdk_system_29_android"],

    static_libs: ["art.module.public.api.stubs"],

    dist: {

    dist: {

        dir: "apistubs/android/module-lib",

        dir: "apistubs/android/module-lib",

    },

    },

api/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ genrule { 
genrule {

genrule {

    name: "frameworks-base-api-current.txt",

    name: "frameworks-base-api-current.txt",

    srcs: [

    srcs: [

        ":art.module.public.api{.public.api.txt}",

        ":conscrypt.module.public.api{.public.api.txt}",

        ":conscrypt.module.public.api{.public.api.txt}",

        ":framework-media{.public.api.txt}",

        ":framework-media{.public.api.txt}",

        ":framework-mediaprovider{.public.api.txt}",

        ":framework-mediaprovider{.public.api.txt}",
@@ -64,6 +65,7 @@ genrule { 
    name: "frameworks-base-api-current.srcjar",

    name: "frameworks-base-api-current.srcjar",

    srcs: [

    srcs: [

        ":api-stubs-docs-non-updatable",

        ":api-stubs-docs-non-updatable",

        ":art.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":conscrypt.module.public.api{.public.stubs.source}",

        ":framework-media{.public.stubs.source}",

        ":framework-media{.public.stubs.source}",

        ":framework-mediaprovider{.public.stubs.source}",

        ":framework-mediaprovider{.public.stubs.source}",
@@ -83,6 +85,7 @@ genrule { 
genrule {

genrule {

    name: "frameworks-base-api-removed.txt",

    name: "frameworks-base-api-removed.txt",

    srcs: [

    srcs: [

        ":art.module.public.api{.public.removed-api.txt}",

        ":conscrypt.module.public.api{.public.removed-api.txt}",

        ":conscrypt.module.public.api{.public.removed-api.txt}",

        ":framework-media{.public.removed-api.txt}",

        ":framework-media{.public.removed-api.txt}",

        ":framework-mediaprovider{.public.removed-api.txt}",

        ":framework-mediaprovider{.public.removed-api.txt}",

core/api/current.txt

+845 −21163

File changed.

Preview size limit exceeded, changes collapsed.