chromium/src
0
Fork 0
Code Activity

Moves swift_source_set.gni and swiftc.py from ios to apple.

Browse Source 
Bug: 357881994
Change-Id: I62a64af4b8841d4e3ea6abeebac013e81a434389
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5765935
Reviewed-by: Leonard Grey <lgrey@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1338117}
This commit is contained in:
Rohit Rao
2024-08-06 21:35:52 +00:00
committed by Chromium LUCI CQ
parent 9b0084c420
commit 9d14e4aa0a
22 changed files with 21 additions and 21 deletions
build
config
apple
swift_source_set.gni
toolchain
apple
swiftc.pytoolchain.gni
content
app
ios
appex
BUILD.gn
shell
BUILD.gn
ios
chrome
browser
bring_android_tabs
ui_bundled
BUILD.gn
price_insights
ui
BUILD.gn
shared
ui
layout_guide
BUILD.gn
util
BUILD.gn
snapshots
model
BUILD.gn
spotlight_debugger
ui_bundled
BUILD.gn
ui
omnibox
popup
BUILD.gn
popup_menu
overflow_menu
BUILD.gn
settings
safety_check
BUILD.gn
tab_switcher
tab_grid
inactive_tabs
BUILD.gn
tab_strip
ui
BUILD.gn
widget_kit
model
BUILD.gn
common
ui
colors
BUILD.gn
util
BUILD.gn
test
swift_interop
BUILD.gn
widget_kit_extension
BUILD.gn
intents
src
BUILD.gn

0
build/config/ios/swift_source_set.gni → build/config/apple/swift_source_set.gni

0
build/toolchain/ios/swiftc.py → build/toolchain/apple/swiftc.py

4
build/toolchain/apple/toolchain.gni

@ -87,7 +87,7 @@ tool_versions = exec_script(
"//build/toolchain/apple/linker_driver.py",
"//build/toolchain/ios/compile_xcassets.py",
"//build/toolchain/ios/const_extract_protocols.json",
"//build/toolchain/ios/swiftc.py",
"//build/toolchain/apple/swiftc.py",
],
root_build_dir),
"trim scope")
@ -629,7 +629,7 @@ template("single_apple_toolchain") {
# disallow future uses of Swift on macOS. https://crbug.com/965663.
if (toolchain_args.current_os == "ios") {
tool("swift") {
_tool = rebase_path("//build/toolchain/ios/swiftc.py", root_build_dir)
_tool = rebase_path("//build/toolchain/apple/swiftc.py", root_build_dir)
depfile = "{{target_out_dir}}/{{module_name}}.d"
depsformat = "gcc"

2
content/app/ios/appex/BUILD.gn

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/apple/swift_source_set.gni")
import("//build/config/ios/rules.gni")
import("//build/config/ios/swift_source_set.gni")
import("//ios/build/chrome_build.gni")
import("//ios/build/config.gni")

2
content/shell/BUILD.gn

@ -33,8 +33,8 @@ if (is_android) {
import("//third_party/fuchsia-gn-sdk/src/component.gni")
import("//third_party/fuchsia-gn-sdk/src/package.gni")
} else if (is_ios) {
import("//build/config/apple/swift_source_set.gni")
import("//build/config/ios/config.gni")
import("//build/config/ios/swift_source_set.gni")
import("//content/shell/app/ios/extensions.gni")
}

2
ios/chrome/browser/bring_android_tabs/ui_bundled/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
source_set("coordinator") {
sources = [

2
ios/chrome/browser/price_insights/ui/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
source_set("price_insights_ui") {
sources = [

2
ios/chrome/browser/shared/ui/layout_guide/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
source_set("layout_guide") {
sources = [ "layout_guide_names.h" ]

2
ios/chrome/browser/shared/ui/util/BUILD.gn

@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/buildflag_header.gni")
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
import("//ios/build/chrome_build.gni")
source_set("util") {

2
ios/chrome/browser/snapshots/model/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
source_set("model") {
public = [

2
ios/chrome/browser/spotlight_debugger/ui_bundled/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
swift_source_set("spotlight_debugger_swift") {
bridge_header = "spotlight_debugger_swift_bridge.h"

2
ios/chrome/browser/ui/omnibox/popup/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
swift_source_set("popup_swift") {
bridge_header = "popup_swift_bridge.h"

2
ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
source_set("overflow_menu_constants") {
sources = [

2
ios/chrome/browser/ui/settings/safety_check/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
source_set("safety_check_ui") {
sources = [

2
ios/chrome/browser/ui/tab_switcher/tab_grid/inactive_tabs/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
source_set("inactive_tabs") {
sources = [

2
ios/chrome/browser/ui/tab_switcher/tab_strip/ui/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
swift_source_set("swift") {
bridge_header = "tab_strip_ui_swift_bridge.h"

2
ios/chrome/browser/widget_kit/model/BUILD.gn

@ -3,8 +3,8 @@
# found in the LICENSE file.
import("//build/buildflag_header.gni")
import("//build/config/apple/swift_source_set.gni")
import("//build/config/ios/ios_sdk.gni")
import("//build/config/ios/swift_source_set.gni")
import("//ios/build/chrome_build.gni")
buildflag_header("features") {

2
ios/chrome/common/ui/colors/BUILD.gn

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/apple/swift_source_set.gni")
import("//build/config/chrome_build.gni")
import("//build/config/ios/swift_source_set.gni")
source_set("colors") {
sources = [

2
ios/chrome/common/ui/util/BUILD.gn

@ -3,8 +3,8 @@
# found in the LICENSE file.
import("//build/buildflag_header.gni")
import("//build/config/apple/swift_source_set.gni")
import("//build/config/ios/ios_sdk.gni")
import("//build/config/ios/swift_source_set.gni")
source_set("util") {
sources = [

2
ios/chrome/test/swift_interop/BUILD.gn

@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/apple/swift_source_set.gni")
import("//build/config/ios/ios_test_runner_xcuitest.gni")
import("//build/config/ios/rules.gni")
import("//build/config/ios/swift_source_set.gni")
source_set("objc_interop_tests") {
testonly = true

2
ios/chrome/widget_kit_extension/BUILD.gn

@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/apple/swift_source_set.gni")
import("//build/config/ios/ios_sdk.gni")
import("//build/config/ios/swift_source_set.gni")
import("//build/config/locales.gni")
import("//ios/build/chrome_build.gni")
import("//ios/chrome/extension_repack.gni")

2
ios/intents/src/BUILD.gn

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ios/swift_source_set.gni")
import("//build/config/apple/swift_source_set.gni")
source_set("src") {
sources = [