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

Commit c8d07d64 authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Android (Google) Code Review
Browse files

Merge "Include flag in build target so it is picked up by gantry" into main

parents 9daf9faf f3562894

AconfigFlags.bp

+16 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ aconfig_srcjars = [ 
    ":com.android.internal.pm.pkg.component.flags-aconfig-java{.generated_srcjars}",

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

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

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

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

    ":com.android.server.flags.services-aconfig-java{.generated_srcjars}",

    ":com.android.text.flags-aconfig-java{.generated_srcjars}",
@@ -566,6 +567,21 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// MediaProjection

aconfig_declarations {

    name: "com.android.media.flags.projection-aconfig",

    package: "com.android.media.projection.flags",

    srcs: [

        "media/java/android/media/flags/projection.aconfig",

    ],

}



java_aconfig_library {

    name: "com.android.media.flags.projection-aconfig-java",

    aconfig_declarations: "com.android.media.flags.projection-aconfig",

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

}



// Media TV

aconfig_declarations {

    name: "android.media.tv.flags-aconfig",

media/java/android/media/flags/projection.aconfig

+1 −1
Original line number Diff line number Diff line 
package: "com.android.media.flags"

package: "com.android.media.projection.flags"



# Project link: https://gantry.corp.google.com/projects/android_platform_window_surfaces/changes