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

Commit aea1d8e2 authored by Dennis Shen's avatar Dennis Shen
Browse files

Revert^2 "Set container to system for aconfig_declarations in AconfigFlags.bp" 

This reverts commit 02287dc9.

Reason for revert: Performance regression is gone based on go/abtd verification, reintroduce the change.

Change-Id: I0dceae0d564612925f23002ac76fb60bbbe599f1
parent 9ab5c649

AconfigFlags.bp

+62 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "com.android.window.flags",

    container: "system",

    srcs: ["core/java/android/window/flags/*.aconfig"],

}
@@ -174,6 +175,7 @@ aconfig_declarations { 
    name: "android.hardware.devicestate.feature.flags-aconfig",

    exportable: true,

    package: "android.hardware.devicestate.feature.flags",

    container: "system",

    srcs: ["core/java/android/hardware/devicestate/feature/*.aconfig"],

}
@@ -188,6 +190,7 @@ aconfig_declarations { 
    name: "com.android.hardware.input.input-aconfig",

    exportable: true,

    package: "com.android.hardware.input",

    container: "system",

    srcs: ["core/java/android/hardware/input/*.aconfig"],

}
@@ -207,6 +210,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "com.android.text.flags",

    container: "system",

    srcs: ["core/java/android/text/flags/*.aconfig"],

}
@@ -225,6 +229,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "android.location.flags-aconfig",

    package: "android.location.flags",

    container: "system",

    srcs: [

        "location/java/android/location/flags/*.aconfig",

    ],
@@ -246,6 +251,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.nfc.flags-aconfig",

    package: "android.nfc",

    container: "system",

    srcs: ["nfc/java/android/nfc/*.aconfig"],

}
@@ -276,6 +282,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.security.flags-aconfig",

    package: "android.security",

    container: "system",

    srcs: ["core/java/android/security/*.aconfig"],

}
@@ -296,6 +303,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.app.usage.flags-aconfig",

    package: "android.app.usage",

    container: "system",

    srcs: ["core/java/android/app/usage/*.aconfig"],

}
@@ -379,6 +387,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.companion.virtualdevice.flags-aconfig",

    package: "android.companion.virtualdevice.flags",

    container: "system",

    srcs: ["core/java/android/companion/virtual/flags/*.aconfig"],

}
@@ -391,6 +400,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.companion.virtual.flags-aconfig",

    package: "android.companion.virtual.flags",

    container: "system",

    srcs: ["core/java/android/companion/virtual/*.aconfig"],

}
@@ -398,6 +408,7 @@ aconfig_declarations { 
aconfig_declarations {

    name: "android.view.inputmethod.flags-aconfig",

    package: "android.view.inputmethod",

    container: "system",

    srcs: ["core/java/android/view/inputmethod/flags.aconfig"],

}
@@ -411,6 +422,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.os.vibrator.flags-aconfig",

    package: "android.os.vibrator",

    container: "system",

    srcs: ["core/java/android/os/vibrator/*.aconfig"],

}
@@ -424,6 +436,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.view.flags-aconfig",

    package: "android.view.flags",

    container: "system",

    srcs: ["core/java/android/view/flags/*.aconfig"],

}
@@ -442,6 +455,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "android.view.accessibility.flags-aconfig",

    package: "android.view.accessibility",

    container: "system",

    srcs: ["core/java/android/view/accessibility/flags/*.aconfig"],

}
@@ -461,6 +475,7 @@ aconfig_declarations { 
    name: "android.hardware.flags-aconfig",

    exportable: true,

    package: "android.hardware.flags",

    container: "system",

    srcs: ["core/java/android/hardware/flags/*.aconfig"],

}
@@ -474,6 +489,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.widget.flags-aconfig",

    package: "android.widget.flags",

    container: "system",

    srcs: ["core/java/android/widget/flags/*.aconfig"],

}
@@ -493,6 +509,7 @@ rust_aconfig_library { 
aconfig_declarations {

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

    package: "android.content.pm",

    container: "system",

    srcs: ["core/java/android/content/pm/flags.aconfig"],

}
@@ -513,6 +530,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.content.res",

    container: "system",

    srcs: ["core/java/android/content/res/*.aconfig"],

}
@@ -533,6 +551,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

    srcs: ["media/java/android/media/flags/media_better_together.aconfig"],

}
@@ -554,6 +573,7 @@ aconfig_declarations { 
    name: "com.android.media.flags.editing-aconfig",

    exportable: true,

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

    container: "system",

    srcs: [

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

    ],
@@ -569,6 +589,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

    srcs: [

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

    ],
@@ -600,6 +621,7 @@ aconfig_declarations { 
    name: "android.media.tv.flags-aconfig",

    exportable: true,

    package: "android.media.tv.flags",

    container: "system",

    srcs: ["media/java/android/media/tv/flags/media_tv.aconfig"],

}
@@ -614,6 +636,7 @@ aconfig_declarations { 
    name: "android.app.ondeviceintelligence-aconfig",

    exportable: true,

    package: "android.app.ondeviceintelligence.flags",

    container: "system",

    srcs: ["core/java/android/app/ondeviceintelligence/flags/ondevice_intelligence.aconfig"],

}
@@ -627,6 +650,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.permission.flags-aconfig",

    package: "android.permission.flags",

    container: "system",

    srcs: ["core/java/android/permission/flags.aconfig"],

}
@@ -659,6 +683,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.database.sqlite-aconfig",

    package: "android.database.sqlite",

    container: "system",

    srcs: ["core/java/android/database/sqlite/*.aconfig"],

}
@@ -679,6 +704,7 @@ aconfig_declarations { 
    name: "android.hardware.biometrics.flags-aconfig",

    exportable: true,

    package: "android.hardware.biometrics",

    container: "system",

    srcs: ["core/java/android/hardware/biometrics/flags.aconfig"],

}
@@ -730,6 +756,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.multiuser.flags-aconfig",

    package: "android.multiuser",

    container: "system",

    srcs: ["core/java/android/content/pm/multiuser.aconfig"],

}
@@ -743,6 +770,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.app.flags-aconfig",

    package: "android.app",

    container: "system",

    srcs: ["core/java/android/app/*.aconfig"],

}
@@ -757,6 +785,7 @@ aconfig_declarations { 
    name: "android.hardware.radio.flags-aconfig",

    exportable: true,

    package: "android.hardware.radio",

    container: "system",

    srcs: ["core/java/android/hardware/radio/*.aconfig"],

}
@@ -770,6 +799,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.credentials.flags-aconfig",

    package: "android.credentials.flags",

    container: "system",

    srcs: ["core/java/android/credentials/flags.aconfig"],

    exportable: true,

}
@@ -792,6 +822,7 @@ aconfig_declarations { 
    name: "android.view.contentprotection.flags-aconfig",

    exportable: true,

    package: "android.view.contentprotection.flags",

    container: "system",

    srcs: ["core/java/android/view/contentprotection/flags/*.aconfig"],

}
@@ -805,6 +836,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.server.flags.services-aconfig",

    package: "com.android.server.flags",

    container: "system",

    srcs: ["services/core/java/com/android/server/flags/*.aconfig"],

}
@@ -819,6 +851,7 @@ aconfig_declarations { 
    name: "android.service.appprediction.flags-aconfig",

    exportable: true,

    package: "android.service.appprediction.flags",

    container: "system",

    srcs: ["core/java/android/service/appprediction/flags/*.aconfig"],

}
@@ -833,6 +866,7 @@ aconfig_declarations { 
    name: "android.service.controls.flags-aconfig",

    exportable: true,

    package: "android.service.controls.flags",

    container: "system",

    srcs: ["core/java/android/service/controls/flags/*.aconfig"],

}
@@ -847,6 +881,7 @@ aconfig_declarations { 
    name: "android.service.voice.flags-aconfig",

    exportable: true,

    package: "android.service.voice.flags",

    container: "system",

    srcs: ["core/java/android/service/voice/flags/*.aconfig"],

}
@@ -860,6 +895,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.autofill.flags-aconfig",

    package: "android.service.autofill",

    container: "system",

    srcs: [

        "services/autofill/bugfixes.aconfig",

        "services/autofill/features.aconfig",
@@ -877,6 +913,7 @@ aconfig_declarations { 
    name: "android.companion.flags-aconfig",

    exportable: true,

    package: "android.companion",

    container: "system",

    srcs: ["core/java/android/companion/*.aconfig"],

}
@@ -891,6 +928,7 @@ aconfig_declarations { 
    name: "android.net.platform.flags-aconfig",

    exportable: true,

    package: "android.net.platform.flags",

    container: "system",

    srcs: ["core/java/android/net/flags.aconfig"],

    visibility: [":__subpackages__"],

}
@@ -900,6 +938,7 @@ aconfig_declarations { 
    name: "com.android.net.thread.platform.flags-aconfig",

    exportable: true,

    package: "com.android.net.thread.platform.flags",

    container: "system",

    srcs: ["core/java/android/net/thread/flags.aconfig"],

}
@@ -920,6 +959,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

    srcs: ["media/jni/playback_flags.aconfig"],

}
@@ -938,6 +978,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.net.vcn",

    container: "system",

    srcs: ["core/java/android/net/vcn/*.aconfig"],

}
@@ -951,6 +992,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "device_policy_aconfig_flags",

    package: "android.app.admin.flags",

    container: "system",

    srcs: [

        "core/java/android/app/admin/flags/flags.aconfig",

    ],
@@ -978,6 +1020,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "android.service.chooser.flags-aconfig",

    package: "android.service.chooser",

    container: "system",

    srcs: ["core/java/android/service/chooser/flags.aconfig"],

}
@@ -996,6 +1039,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "framework-jobscheduler-job.flags-aconfig",

    package: "android.app.job",

    container: "system",

    exportable: true,

    srcs: ["apex/jobscheduler/framework/aconfig/job.aconfig"],

}
@@ -1010,6 +1054,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.dreams.flags-aconfig",

    package: "android.service.dreams",

    container: "system",

    srcs: ["core/java/android/service/dreams/flags.aconfig"],

}
@@ -1050,6 +1095,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.app.contextualsearch.flags-aconfig",

    package: "android.app.contextualsearch.flags",

    container: "system",

    srcs: ["core/java/android/app/contextualsearch/flags.aconfig"],

}
@@ -1064,6 +1110,7 @@ aconfig_declarations { 
    name: "android.app.smartspace.flags-aconfig",

    exportable: true,

    package: "android.app.smartspace.flags",

    container: "system",

    srcs: ["core/java/android/app/smartspace/flags.aconfig"],

}
@@ -1084,6 +1131,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.view.contentcapture.flags-aconfig",

    package: "android.view.contentcapture.flags",

    container: "system",

    srcs: ["core/java/android/view/contentcapture/flags/*.aconfig"],

}
@@ -1098,6 +1146,7 @@ aconfig_declarations { 
    name: "android.hardware.usb.flags-aconfig",

    exportable: true,

    package: "android.hardware.usb.flags",

    container: "system",

    srcs: ["core/java/android/hardware/usb/flags/*.aconfig"],

}
@@ -1118,6 +1167,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.tracing.flags-aconfig",

    package: "android.tracing",

    container: "system",

    srcs: ["core/java/android/tracing/flags.aconfig"],

}
@@ -1136,6 +1186,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "android.appwidget.flags-aconfig",

    package: "android.appwidget.flags",

    container: "system",

    srcs: ["core/java/android/appwidget/flags.aconfig"],

}
@@ -1149,6 +1200,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.server.app.flags-aconfig",

    package: "android.server.app",

    container: "system",

    srcs: ["services/core/java/com/android/server/app/flags.aconfig"],

}
@@ -1162,6 +1214,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.webkit.flags-aconfig",

    package: "android.webkit",

    container: "system",

    srcs: [

        "core/java/android/webkit/*.aconfig",

        "services/core/java/com/android/server/webkit/*.aconfig",
@@ -1179,6 +1232,7 @@ aconfig_declarations { 
    name: "android.provider.flags-aconfig",

    exportable: true,

    package: "android.provider",

    container: "system",

    srcs: ["core/java/android/provider/*.aconfig"],

}
@@ -1200,6 +1254,7 @@ aconfig_declarations { 
    name: "android.speech.flags-aconfig",

    exportable: true,

    package: "android.speech.flags",

    container: "system",

    srcs: ["core/java/android/speech/flags/*.aconfig"],

}
@@ -1221,6 +1276,7 @@ aconfig_declarations { 
    name: "android.content.flags-aconfig",

    exportable: true,

    package: "android.content.flags",

    container: "system",

    srcs: ["core/java/android/content/flags/flags.aconfig"],

}
@@ -1234,6 +1290,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.adaptiveauth.flags-aconfig",

    package: "android.adaptiveauth",

    container: "system",

    srcs: ["core/java/android/adaptiveauth/*.aconfig"],

}
@@ -1248,6 +1305,7 @@ aconfig_declarations { 
    name: "android.crashrecovery.flags-aconfig",

    exportable: true,

    package: "android.crashrecovery.flags",

    container: "system",

    srcs: ["packages/CrashRecovery/aconfig/flags.aconfig"],

}
@@ -1275,6 +1333,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.net.wifi.flags-aconfig",

    package: "android.net.wifi.flags",

    container: "system",

    srcs: ["wifi/*.aconfig"],

}
@@ -1294,6 +1353,7 @@ aconfig_declarations { 
    name: "android.app.wearable.flags-aconfig",

    exportable: true,

    package: "android.app.wearable",

    container: "system",

    srcs: ["core/java/android/app/wearable/*.aconfig"],

}
@@ -1306,6 +1366,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.internal.pm.pkg.component.flags-aconfig",

    package: "com.android.internal.pm.pkg.component.flags",

    container: "system",

    srcs: ["core/java/com/android/internal/pm/pkg/component/flags/flags.aconfig"],

}
@@ -1326,6 +1387,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.systemserver.flags-aconfig",

    package: "android.server",

    container: "system",

    srcs: ["services/java/com/android/server/flags.aconfig"],

}

apex/jobscheduler/framework/aconfig/job.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "android.app.job"

container: "system"



flag {

    name: "enforce_minimum_time_windows"

core/java/android/adaptiveauth/flags.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "android.adaptiveauth"

container: "system"



flag {

  name: "enable_adaptive_auth"

core/java/android/app/activity_manager.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "android.app"

container: "system"



flag {

     namespace: "system_performance"

core/java/android/app/admin/flags/flags.aconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# proto-message: flag_declarations



package: "android.app.admin.flags"

container: "system"



flag {

  name: "policy_engine_migration_v2_enabled"