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

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

Merge "Move aconfig-srcjars srcs into shared defaults" into main am: 0a63944d 

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



Change-Id: Ie8169a12ced2e65d342652dbdf562b609786b242
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c978920 0a63944d

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ filegroup { 
    name: "android-non-updatable-stub-sources",

    srcs: [

        ":framework-mime-sources", // mimemap builds separately but has no separate droidstubs.

        ":framework-minus-apex-aconfig-srcjars",

        ":framework-non-updatable-sources",

        ":opt-telephony-srcs",

        ":opt-net-voip-srcs",

api/StubLibraries.bp

+0 −12
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ 


droidstubs {

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

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",
@@ -91,9 +88,6 @@ module_libs = [ 


droidstubs {

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

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",
@@ -134,9 +128,6 @@ droidstubs { 


droidstubs {

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

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",
@@ -184,9 +175,6 @@ droidstubs { 


droidstubs {

    name: "module-lib-api-stubs-docs-non-updatable",

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",