Commit 7007950c authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Fix Info.plist and entitlements for "catalyst" environment

Move ios/chrome/app/resources/Info.plist keys specific to the
"device" or "simulator" environments to a separate file, and
add a file for "catalyst" specific keys. Update the build rule
to merge the correct .plist files.

Add a new entitlement file for key that are required for a build
targeting the "catalyst" environment and update the build rule
to merge it to the generic entitlements.

Bug: 1138425
Change-Id: I164aeadf66320885695fb38707f0b10c22e07158
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2498487
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarOlivier Robin <olivierrobin@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821148}
parent 08ea8abc
......@@ -4,6 +4,7 @@
import("//build/apple/tweak_info_plist.gni")
import("//build/buildflag_header.gni")
import("//build/config/ios/ios_sdk.gni")
import("//build/config/ios/rules.gni")
import("//build/config/mac/base_rules.gni")
import("//ios/build/chrome_build.gni")
......@@ -86,6 +87,11 @@ tweak_info_plist("info_plist") {
"resources/Info.plist",
"resources/ChromeAddition+Info.plist",
]
if (target_environment == "catalyst") {
info_plists += [ "resources/Environment+Catalyst.plist" ]
} else {
info_plists += [ "resources/Environment+Default.plist" ]
}
if (ios_chrome_info_plist_additions != []) {
info_plists += ios_chrome_info_plist_additions
}
......@@ -119,6 +125,9 @@ compile_entitlements("entitlements") {
if (ios_chrome_entitlements_additions != []) {
entitlements_templates += ios_chrome_entitlements_additions
}
if (target_environment == "catalyst") {
entitlements_templates += [ "resources/Environment+Catalyst.entitlements" ]
}
substitutions = [ "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix" ]
output_name = "$target_gen_dir/$chromium_short_name.entitlements"
}
......
<?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>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.get-task-allow</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>
<?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>LSMinimumSystemVersion</key>
<string>10.15.6</string>
<key>NSSupportsAutomaticTermination</key>
<true/>
<key>NSSupportsSuddenTermination</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>
<?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>LSRequiresIPhoneOS</key>
<true/>
</dict>
</plist>
......@@ -81,8 +81,6 @@
</array>
<key>CFBundleVersion</key>
<string>0.0.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
<key>NSAppTransportSecurity</key>
......
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