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

Commit d3c6c358 authored by Victor Chang's avatar Victor Chang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add ART module-lib and system API to the collection"" into sc-dev am: d59fb76b 

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

Change-Id: Iaa2a50032f451d7b23379fbd7f099ef886b4d596
parents c5ada5dd d59fb76b

StubLibraries.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,7 @@ modules_public_stubs = [ 




modules_system_stubs = [

modules_system_stubs = [

    "android.net.ipsec.ike.stubs.system",

    "android.net.ipsec.ike.stubs.system",

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

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

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

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

    "framework-appsearch.stubs.system",

    "framework-appsearch.stubs.system",

    "framework-connectivity.stubs.system",

    "framework-connectivity.stubs.system",

api/Android.bp

+0 −4
Original line number Original line Diff line number Diff line
@@ -161,7 +161,6 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

        ":android.net.ipsec.ike{.system.api.txt}",

        ":android.net.ipsec.ike{.system.api.txt}",

        ":framework-appsearch{.system.api.txt}",

        ":framework-appsearch{.system.api.txt}",

        ":framework-connectivity{.system.api.txt}",

        ":framework-connectivity{.system.api.txt}",
@@ -216,7 +215,6 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

        ":android.net.ipsec.ike{.system.removed-api.txt}",

        ":android.net.ipsec.ike{.system.removed-api.txt}",

        ":framework-appsearch{.system.removed-api.txt}",

        ":framework-appsearch{.system.removed-api.txt}",

        ":framework-connectivity{.system.removed-api.txt}",

        ":framework-connectivity{.system.removed-api.txt}",
@@ -253,7 +251,6 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

        ":android.net.ipsec.ike{.module-lib.api.txt}",

        ":android.net.ipsec.ike{.module-lib.api.txt}",

        ":framework-appsearch{.module-lib.api.txt}",

        ":framework-appsearch{.module-lib.api.txt}",

        ":framework-connectivity{.module-lib.api.txt}",

        ":framework-connectivity{.module-lib.api.txt}",
@@ -310,7 +307,6 @@ genrule { 
genrule {

genrule {

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

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

    srcs: [

    srcs: [

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

        ":android.net.ipsec.ike{.module-lib.removed-api.txt}",

        ":android.net.ipsec.ike{.module-lib.removed-api.txt}",

        ":framework-appsearch{.module-lib.removed-api.txt}",

        ":framework-appsearch{.module-lib.removed-api.txt}",

        ":framework-connectivity{.module-lib.removed-api.txt}",

        ":framework-connectivity{.module-lib.removed-api.txt}",