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

Commit 38588bdc authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Add aconfig declarations to f/b droidstubs" into main am: 85e169c3 

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



Change-Id: I39dabd7d94a6bbea6e434ff3d7f1df3f227c5c9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d0a39a8 85e169c3

AconfigFlags.bp

+20 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ aconfig_srcjars = [ 
    ":android.content.pm.flags-aconfig-java{.generated_srcjars}",

    ":android.content.res.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",

    ":android.media.playback.flags-aconfig-java{.generated_srcjars}",

    ":android.net.vcn.flags-aconfig-java{.generated_srcjars}",

    ":android.nfc.flags-aconfig-java{.generated_srcjars}",

    ":android.os.flags-aconfig-java{.generated_srcjars}",
@@ -30,6 +31,25 @@ aconfig_srcjars = [ 
    // !!! KEEP THIS LIST ALPHABETICAL !!!

]



stubs_defaults {

    name: "framework-minus-apex-aconfig-declarations",

    aconfig_declarations: [

        "android.content.pm.flags-aconfig",

        "android.content.res.flags-aconfig",

        "android.hardware.biometrics.flags-aconfig",

        "android.media.playback.flags-aconfig",

        "android.net.vcn.flags-aconfig",

        "android.nfc.flags-aconfig",

        "android.os.flags-aconfig",

        "android.security.flags-aconfig",

        "com.android.hardware.camera2-aconfig",

        "com.android.hardware.input.input-aconfig",

        "com.android.window.flags.window-aconfig",

        "com.android.text.flags-aconfig",

        "com.android.net.flags-aconfig",

    ],

}



filegroup {

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

    srcs: aconfig_srcjars,

api/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ packages_to_document = [ 
// classpath (or sources) somehow.

stubs_defaults {

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

    defaults: ["framework-minus-apex-aconfig-declarations"],

    srcs: [":android-non-updatable-stub-sources"],

    sdk_version: "none",

    system_modules: "none",