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

Commit 760a44e4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ea89bae8 02287dc9

AconfigFlags.bp

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

}
@@ -173,7 +172,6 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.hardware.devicestate.feature.flags-aconfig",

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

    container: "system",

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

}
@@ -187,7 +185,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -207,7 +204,6 @@ 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,7 +222,6 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.location.flags",

    container: "system",

    srcs: [

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

    ],
@@ -248,7 +243,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.nfc",

    container: "system",

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

}
@@ -279,7 +273,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.security",

    container: "system",

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

}
@@ -300,7 +293,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.app.usage",

    container: "system",

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

}
@@ -384,7 +376,6 @@ 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"],

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

}
@@ -405,7 +395,6 @@ aconfig_declarations { 
aconfig_declarations {

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

    package: "android.view.inputmethod",

    container: "system",

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

}
@@ -419,7 +408,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.os.vibrator",

    container: "system",

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

}
@@ -433,7 +421,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.view.flags",

    container: "system",

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

}
@@ -452,7 +439,6 @@ 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"],

}
@@ -471,7 +457,6 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.flags",

    container: "system",

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

}
@@ -485,7 +470,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.widget.flags",

    container: "system",

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

}
@@ -505,7 +489,6 @@ 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"],

}
@@ -526,7 +509,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.content.res",

    container: "system",

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

}
@@ -547,7 +529,6 @@ 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"],

}
@@ -568,7 +549,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

    srcs: [

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

    ],
@@ -584,7 +564,6 @@ 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",

    ],
@@ -615,7 +594,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -629,7 +607,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -643,7 +620,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.permission.flags",

    container: "system",

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

}
@@ -663,7 +639,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.database.sqlite",

    container: "system",

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

}
@@ -683,7 +658,6 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.hardware.biometrics",

    container: "system",

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

}
@@ -735,7 +709,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.multiuser",

    container: "system",

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

}
@@ -749,7 +722,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.app",

    container: "system",

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

}
@@ -763,7 +735,6 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.hardware.radio.flags-aconfig",

    package: "android.hardware.radio",

    container: "system",

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

}
@@ -777,7 +748,6 @@ 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,

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

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

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

    container: "system",

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

}
@@ -813,7 +782,6 @@ 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"],

}
@@ -827,7 +795,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -841,7 +808,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -855,7 +821,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -869,7 +834,6 @@ 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",
@@ -886,7 +850,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.companion",

    container: "system",

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

}
@@ -900,7 +863,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

    visibility: [":__subpackages__"],

}
@@ -909,7 +871,6 @@ aconfig_declarations { 
aconfig_declarations {

    name: "com.android.net.thread.platform.flags-aconfig",

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

    container: "system",

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

}
@@ -930,7 +891,6 @@ 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"],

}
@@ -949,7 +909,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.net.vcn",

    container: "system",

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

}
@@ -963,7 +922,6 @@ 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",

    ],
@@ -991,7 +949,6 @@ 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"],

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

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

    package: "android.app.job",

    container: "system",

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

}
@@ -1024,7 +980,6 @@ 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"],

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

}
@@ -1079,7 +1033,6 @@ java_aconfig_library { 
aconfig_declarations {

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

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

    container: "system",

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

}
@@ -1100,7 +1053,6 @@ 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"],

}
@@ -1114,7 +1066,6 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.hardware.usb.flags-aconfig",

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

    container: "system",

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

}
@@ -1135,7 +1086,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.tracing",

    container: "system",

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

}
@@ -1154,7 +1104,6 @@ cc_aconfig_library { 
aconfig_declarations {

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

    package: "android.appwidget.flags",

    container: "system",

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

}
@@ -1168,7 +1117,6 @@ 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"],

}
@@ -1182,7 +1130,6 @@ 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",
@@ -1199,7 +1146,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.provider",

    container: "system",

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

}
@@ -1220,7 +1166,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.speech.flags",

    container: "system",

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

}
@@ -1241,7 +1186,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.content.flags",

    container: "system",

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

}
@@ -1255,7 +1199,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.adaptiveauth",

    container: "system",

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

}
@@ -1269,7 +1212,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.crashrecovery.flags",

    container: "system",

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

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

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

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

    container: "system",

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

}
@@ -1309,7 +1250,6 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.app.wearable",

    container: "system",

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

}
@@ -1322,7 +1262,6 @@ 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"],

}
@@ -1343,7 +1282,6 @@ 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

+0 −1
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

+0 −1
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

+0 −1
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

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



package: "android.app.admin.flags"

container: "system"



flag {

  name: "policy_engine_migration_v2_enabled"