Skip to content

GitLab

T
tangled
Commit cb6ed4c8 authored by Olivier Robin's avatar Olivier Robin Committed by Commit Bot
Browse files
Options

Split Experimental.plist in multiple plist 

This will allow to add sections dependant on gn flags
and ensure that flags and blank lines stay at the end.

Bug: 1017434
Change-Id: Ia982cb84f4092631ba6dd7c0b14063290db773fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159243
Commit-Queue: Olivier Robin <olivierrobin@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Auto-Submit: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760947}
parent 16a2d68e
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 155 deletions
ios/chrome/browser/BUILD.gn
View file @ cb6ed4c8
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/config/ios/rules.gni") import("//build/config/ios/rules.gni")
import("//build/mac/tweak_info_plist.gni")
import("//rlz/buildflags/buildflags.gni") import("//rlz/buildflags/buildflags.gni")
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
...@@ -255,11 +256,23 @@ source_set("browser_impl") { ...@@ -255,11 +256,23 @@ source_set("browser_impl") {
} }
} }
bundle_data("settings_resources") { tweak_info_plist("experimental_info_plist") {
sources = [ info_plists = [
"resources/Settings.bundle/Experimental.plist", "resources/Settings.bundle/Experimental.plist",
"resources/Settings.bundle/Root.plist", "resources/Settings.bundle/ExperimentalFlags.plist",
"resources/Settings.bundle/ExperimentalBlank.plist",
] ]
}
bundle_data("settings_resources_experimental_plist") {
public_deps = [ ":experimental_info_plist" ]
sources = get_target_outputs(":experimental_info_plist")
outputs = [ "{{bundle_resources_dir}}/Settings.bundle/Experimental.plist" ]
}
bundle_data("settings_resources") {
public_deps = [ ":settings_resources_experimental_plist" ]
sources = [ "resources/Settings.bundle/Root.plist" ]
outputs = [ "{{bundle_resources_dir}}/Settings.bundle/{{source_file_part}}" ] outputs = [ "{{bundle_resources_dir}}/Settings.bundle/{{source_file_part}}" ]
} }
......
ios/chrome/browser/resources/Settings.bundle/Experimental.plist
View file @ cb6ed4c8
...@@ -178,158 +178,6 @@ ...@@ -178,158 +178,6 @@
<key>AutocorrectionType</key> <key>AutocorrectionType</key>
<string>No</string> <string>No</string>
</dict> </dict>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string>Extra Flags (one per line)</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Append Extra Flags</string>
<key>Key</key>
<string>EnableFreeformCommandLineFlags</string>
<key>DefaultValue</key>
<false/>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag1</string>
<key>Key</key>
<string>FreeformCommandLineFlag1</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag2</string>
<key>Key</key>
<string>FreeformCommandLineFlag2</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag3</string>
<key>Key</key>
<string>FreeformCommandLineFlag3</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag4</string>
<key>Key</key>
<string>FreeformCommandLineFlag4</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag5</string>
<key>Key</key>
<string>FreeformCommandLineFlag5</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string>Blank lines for iOS 13 bug</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string>See crbug.com/1056606</string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>a</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>b</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>c</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>d</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>e</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>f</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>g</string>
</dict>
</array> </array>
</dict> </dict>
</plist> </plist>
ios/chrome/browser/resources/Settings.bundle/ExperimentalBlank.plist 0 → 100644
View file @ cb6ed4c8
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string>Blank lines for iOS 13 bug</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string>See crbug.com/1056606</string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>a</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>b</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>c</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>d</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>e</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>f</string>
</dict>
<dict>
<key>Type</key>
<string>PSTitleValueSpecifier</string>
<key>Title</key>
<string></string>
<key>DefaultValue</key>
<string></string>
<key>Key</key>
<string>g</string>
</dict>
</array>
</dict>
</plist>
ios/chrome/browser/resources/Settings.bundle/ExperimentalFlags.plist 0 → 100644
View file @ cb6ed4c8
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string>Extra Flags (one per line)</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Append Extra Flags</string>
<key>Key</key>
<string>EnableFreeformCommandLineFlags</string>
<key>DefaultValue</key>
<false/>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag1</string>
<key>Key</key>
<string>FreeformCommandLineFlag1</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag2</string>
<key>Key</key>
<string>FreeformCommandLineFlag2</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag3</string>
<key>Key</key>
<string>FreeformCommandLineFlag3</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag4</string>
<key>Key</key>
<string>FreeformCommandLineFlag4</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>Title</key>
<string>Flag5</string>
<key>Key</key>
<string>FreeformCommandLineFlag5</string>
<key>DefaultValue</key>
<string></string>
<key>AutocorrectionType</key>
<string>No</string>
</dict>
</array>
</dict>
</plist>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment