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

Commit badb14fd authored by Justin Yun's avatar Justin Yun Committed by Automerger Merge Worker
Browse files

Merge "Revert "Replace system_ext container with system"" into main am: faa8f0e3 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3463347



Change-Id: I319bce0a062165a630c5ed391ad9305eaac511e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78c5a735 faa8f0e3

aconfig/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ package { 
aconfig_declarations {

    name: "aconfig_settings_flags",

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

    container: "system",

    container: "system_ext",

    srcs: [

        "*.aconfig",

        "catalyst/*.aconfig",
@@ -21,7 +21,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "factory_reset_flags",

    package: "com.android.settings.factory_reset",

    container: "system",

    container: "system_ext",

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

}
@@ -33,7 +33,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "media_drm_flags",

    package: "com.android.settings.media_drm",

    container: "system",

    container: "system_ext",

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

}
@@ -45,7 +45,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "accessibility_flags",

    package: "com.android.settings.accessibility",

    container: "system",

    container: "system_ext",

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

}
@@ -57,7 +57,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "development_settings_flags",

    package: "com.android.settings.development",

    container: "system",

    container: "system_ext",

    srcs: [

        "development/**/*.aconfig",

    ],
@@ -71,7 +71,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "keyboard_flags",

    package: "com.android.settings.keyboard",

    container: "system",

    container: "system_ext",

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

}

aconfig/accessibility/accessibility_flags.aconfig

+1 −1
Original line number Diff line number Diff line 
package: "com.android.settings.accessibility"

container: "system"

container: "system_ext"



# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

aconfig/catalyst/about_phone.aconfig

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

container: "system"

container: "system_ext"



flag {

  name: "catalyst_legal_information"

aconfig/development/settings_core_flag_declarations.aconfig

+1 −1
Original line number Diff line number Diff line 
package: "com.android.settings.development"

container: "system"

container: "system_ext"



flag {

  name: "deprecate_list_activity"

aconfig/factory_reset/factory_reset_flag_declarations.aconfig

+1 −1
Original line number Diff line number Diff line 
package: "com.android.settings.factory_reset"

container: "system"

container: "system_ext"



flag {

  name: "enable_factory_reset_wizard"