Skip to content

Commit

Permalink
Move updater from third_party to flutter/third_party (#98)
Browse files Browse the repository at this point in the history
* Move updater from third_party to flutter/third_party

* Formatting

* Fix gn
  • Loading branch information
bryanoltman committed Feb 6, 2025
1 parent d487394 commit 47712b3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 22 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ deps = {
'src/flutter/third_party/ocmock':
Var('flutter_git') + '/third_party/ocmock' + '@' + Var('ocmock_rev'),

'src/third_party/updater':
'src/flutter/third_party/updater':
Var('updater_git') + '@' + Var('updater_rev'),

'src/flutter/third_party/libjpeg-turbo/src':
Expand Down
10 changes: 4 additions & 6 deletions shell/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,9 @@ source_set("common") {
# Needed to compile flutter_tester for macOS.
if (host_os == "mac" && target_os == "mac") {
if (target_cpu == "arm64") {
libs = [ "//third_party/updater/target/aarch64-apple-darwin/release/libupdater.a" ]
libs = [ "//flutter/third_party/updater/target/aarch64-apple-darwin/release/libupdater.a" ]
} else if (target_cpu == "x64") {
libs = [
"//third_party/updater/target/x86_64-apple-darwin/release/libupdater.a",
]
libs = [ "//flutter/third_party/updater/target/x86_64-apple-darwin/release/libupdater.a" ]
}
}

Expand All @@ -179,14 +177,14 @@ source_set("common") {
if (target_cpu == "x64") {
libs = [
"userenv.lib",
"//third_party/updater/target/x86_64-pc-windows-msvc/release/updater.lib",
"//flutter/third_party/updater/target/x86_64-pc-windows-msvc/release/updater.lib",
]
}
}

if (host_os == "linux" && target_os == "linux") {
if (target_cpu == "x64") {
libs = [ "//third_party/updater/target/x86_64-unknown-linux-gnu/release/libupdater.a" ]
libs = [ "//flutter/third_party/updater/target/x86_64-unknown-linux-gnu/release/libupdater.a" ]
}
}
}
Expand Down
14 changes: 4 additions & 10 deletions shell/platform/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,13 @@ source_set("flutter_shell_native_src") {
"GLESv2",
]
if (target_cpu == "arm") {
libs += [ "//third_party/updater/target/armv7-linux-androideabi/release/libupdater.a" ]
libs += [ "//flutter/third_party/updater/target/armv7-linux-androideabi/release/libupdater.a" ]
} else if (target_cpu == "arm64") {
libs += [
"//third_party/updater/target/aarch64-linux-android/release/libupdater.a",
]
libs += [ "//flutter/third_party/updater/target/aarch64-linux-android/release/libupdater.a" ]
} else if (target_cpu == "x64") {
libs += [
"//third_party/updater/target/x86_64-linux-android/release/libupdater.a",
]
libs += [ "//flutter/third_party/updater/target/x86_64-linux-android/release/libupdater.a" ]
} else if (target_cpu == "x86") {
libs += [
"//third_party/updater/target/i686-linux-android/release/libupdater.a",
]
libs += [ "//flutter/third_party/updater/target/i686-linux-android/release/libupdater.a" ]
} else {
assert(false, "Unsupported target_cpu")
}
Expand Down
7 changes: 2 additions & 5 deletions shell/platform/darwin/ios/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,9 @@ source_set("flutter_framework_source") {
]

if (target_cpu == "arm64") {
libs = [
"//third_party/updater/target/aarch64-apple-ios/release/libupdater.a",
]
libs = [ "//flutter/third_party/updater/target/aarch64-apple-ios/release/libupdater.a" ]
} else if (target_cpu == "x64") {
libs =
[ "//third_party/updater/target/x86_64-apple-ios/release/libupdater.a" ]
libs = [ "//flutter/third_party/updater/target/x86_64-apple-ios/release/libupdater.a" ]
} else {
assert(false, "Unsupported target_cpu")
}
Expand Down

0 comments on commit 47712b3

Please sign in to comment.