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

Commit 5a5ecc67 authored by Dennis Shen's avatar Dennis Shen Committed by Android (Google) Code Review
Browse files

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

parents 140aea3f aea1d8e2

AconfigFlags.bp

+62 −0
Original line number Diff line number Diff line
@@ -161,6 +161,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"],

}
@@ -175,6 +176,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"],

}
@@ -189,6 +191,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"],

}
@@ -208,6 +211,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"],

}
@@ -226,6 +230,7 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.location.flags",

    container: "system",

    srcs: [

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

    ],
@@ -247,6 +252,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.nfc",

    container: "system",

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

}
@@ -277,6 +283,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.security",

    container: "system",

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

}
@@ -297,6 +304,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"],

}
@@ -380,6 +388,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"],

}
@@ -392,6 +401,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"],

}
@@ -399,6 +409,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"],

}
@@ -412,6 +423,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"],

}
@@ -425,6 +437,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.view.flags",

    container: "system",

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

}
@@ -443,6 +456,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"],

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

    exportable: true,

    package: "android.hardware.flags",

    container: "system",

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

}
@@ -475,6 +490,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.widget.flags",

    container: "system",

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

}
@@ -494,6 +510,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"],

}
@@ -514,6 +531,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"],

}
@@ -534,6 +552,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"],

}
@@ -555,6 +574,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",

    ],
@@ -570,6 +590,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",

    ],
@@ -601,6 +622,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"],

}
@@ -615,6 +637,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"],

}
@@ -628,6 +651,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.permission.flags",

    container: "system",

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

}
@@ -660,6 +684,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.database.sqlite",

    container: "system",

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

}
@@ -680,6 +705,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"],

}
@@ -731,6 +757,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.multiuser",

    container: "system",

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

}
@@ -744,6 +771,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.app",

    container: "system",

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

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

    exportable: true,

    package: "android.hardware.radio",

    container: "system",

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

}
@@ -771,6 +800,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,

}
@@ -793,6 +823,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"],

}
@@ -806,6 +837,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"],

}
@@ -820,6 +852,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"],

}
@@ -834,6 +867,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"],

}
@@ -848,6 +882,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"],

}
@@ -861,6 +896,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",
@@ -878,6 +914,7 @@ aconfig_declarations { 
    name: "android.companion.flags-aconfig",

    exportable: true,

    package: "android.companion",

    container: "system",

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

}
@@ -892,6 +929,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__"],

}
@@ -901,6 +939,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"],

}
@@ -921,6 +960,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"],

}
@@ -939,6 +979,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"],

}
@@ -952,6 +993,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",

    ],
@@ -979,6 +1021,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"],

}
@@ -997,6 +1040,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"],

}
@@ -1011,6 +1055,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"],

}
@@ -1051,6 +1096,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"],

}
@@ -1065,6 +1111,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"],

}
@@ -1085,6 +1132,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"],

}
@@ -1099,6 +1147,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"],

}
@@ -1119,6 +1168,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.tracing",

    container: "system",

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

}
@@ -1137,6 +1187,7 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.appwidget.flags",

    container: "system",

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

}
@@ -1150,6 +1201,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"],

}
@@ -1163,6 +1215,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",
@@ -1180,6 +1233,7 @@ aconfig_declarations { 
    name: "android.provider.flags-aconfig",

    exportable: true,

    package: "android.provider",

    container: "system",

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

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

    exportable: true,

    package: "android.speech.flags",

    container: "system",

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

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

    exportable: true,

    package: "android.content.flags",

    container: "system",

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

}
@@ -1235,6 +1291,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.adaptiveauth",

    container: "system",

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

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

    exportable: true,

    package: "android.crashrecovery.flags",

    container: "system",

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

}
@@ -1276,6 +1334,7 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

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

    exportable: true,

    package: "android.app.wearable",

    container: "system",

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

}
@@ -1307,6 +1367,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"],

}
@@ -1327,6 +1388,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"