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

Commit 93981966 authored by Motomu Utsumi's avatar Motomu Utsumi Committed by Automerger Merge Worker
Browse files

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main... 

Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160c am: 419b5bf7

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



Change-Id: I9f53d6b423548f9159bcb450e570d9898d0904bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a256a44f 419b5bf7

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ aconfig_srcjars = [ 
    ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",

    ":com.android.hardware.input-aconfig-java{.generated_srcjars}",

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

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

]



filegroup {
@@ -178,3 +179,10 @@ java_aconfig_library { 
    aconfig_declarations: "android.hardware.biometrics.flags-aconfig",

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

}



// CoreNetworking

java_aconfig_library {

    name: "com.android.net.flags-aconfig-java",

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

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

}