AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reformat gn files

Browse Source 
Change-Id: I60ccd1ef19d6a6dc033e20e7ac55c3182d76ea0e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255082
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Robert Phillips 2019-11-18 11:01:05 -05:00 committed by Skia Commit-Bot
parent d4fb7c7b14
commit c919f97768
5 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BUILD.gn
View File

@ -323,7 +323,9 @@ optional("fontmgr_fuchsia") {
if (is_fuchsia && using_fuchsia_sdk) {
deps += [ "//build/fuchsia/fidl:fuchsia.fonts" ]
} else {
deps = [ "//sdk/fidl/fuchsia.fonts" ]
deps = [
"//sdk/fidl/fuchsia.fonts",
]
}
sources = [
"src/ports/SkFontMgr_fuchsia.cpp",
@ -1329,7 +1331,8 @@ if (skia_enable_tools) {
libs += [ "OpenGL32.lib" ]
}
} else if (is_fuchsia && using_fuchsia_sdk) {
libs += [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
libs +=
[ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
}
cflags_objcc = [ "-fobjc-arc" ]
@ -2054,7 +2057,9 @@ if (skia_enable_tools) {
]
include_dirs = [ "//" ]
lib_dirs = []
deps = [ ":skqp_lib", ]
deps = [
":skqp_lib",
]
}
test_app("jitter_gms") {
sources = [
@ -2072,7 +2077,7 @@ if (skia_enable_tools) {
group("skqp_repo") {
testonly = true
deps = [
"//build/fuchsia/skqp:skqp_repo"
"//build/fuchsia/skqp:skqp_repo",
]
}
}

15
build/fuchsia/BUILD.gn
View File

@ -4,13 +4,15 @@
assert(is_fuchsia)
import ("//build/fuchsia/sdk.gni")
import("//build/fuchsia/sdk.gni")
fuchsia_sdk_manifest_exists = false
if (is_fuchsia && using_fuchsia_sdk) {
manifest_exists = exec_script("//build/fuchsia/file_exists",
[ "-file_name",
rebase_path(fuchsia_sdk_manifest_path) ],
[
"-file_name",
rebase_path(fuchsia_sdk_manifest_path),
],
"list lines",
[ "//build/fuchsia/file_exists" ])
if (manifest_exists == [ "true" ]) {
@ -19,14 +21,15 @@ if (is_fuchsia && using_fuchsia_sdk) {
}
group("fuchsia") {
if(fuchsia_sdk_manifest_exists == true) {
if (fuchsia_sdk_manifest_exists == true) {
deps = [
"fidl",
"pkg",
"sysroot",
]
} else {
assert(false, "Fuchsia SDK not found. Set arg skia_update_fuchsia_sdk=True " +
"to initialize.")
assert(false,
"Fuchsia SDK not found. Set arg skia_update_fuchsia_sdk=True " +
"to initialize.")
}
}

20
build/fuchsia/skqp/BUILD.gn
View File

@ -4,7 +4,7 @@
assert(is_fuchsia)
import ("//build/fuchsia/sdk.gni")
import("//build/fuchsia/sdk.gni")
pkg_dir = target_gen_dir
pkg_name = "skqp_pkg"
@ -14,14 +14,19 @@ fuchsia_package(pkg_name) {
name = pkg_name
version = 0
deps = [
"//build/fuchsia", "//:skqp",
"//:skqp",
"//build/fuchsia",
]
pkg_manifest = "${pkg_dir}/${target_name}.manifest"
}
fuchsia_repo("skqp_repo") {
testonly = true
deps = [ ":base_manifest", ":append_assets_to_manifest", ":skqp_pkg" ]
deps = [
":append_assets_to_manifest",
":base_manifest",
":skqp_pkg",
]
# Put repo directory in out dir (not gen dir).
repo = "$target_out_dir/skqp_repo"
@ -38,14 +43,17 @@ group("base_manifest") {
skqp_path = rebase_path("${target_gen_dir}")
sdk_dist_path = rebase_path("${fuchsia_sdk_path}/arch/${target_cpu}/dist")
sdk_sysroot_dist_path = rebase_path("${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/dist/lib")
sdk_sysroot_dist_path =
rebase_path("${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/dist/lib")
skqp_component_manifest = rebase_path("//build/fuchsia/skqp/skqp.cmx")
if (target_cpu == "x64" || target_cpu == "x86_64") {
clang_path=rebase_path("${fuchsia_toolchain_path}/lib/x86_64-unknown-fuchsia/c++")
clang_path =
rebase_path("${fuchsia_toolchain_path}/lib/x86_64-unknown-fuchsia/c++")
} else if (target_cpu == "arm64") {
clang_path=rebase_path("${fuchsia_toolchain_path}/lib/aarch64-unknown-fuchsia/c++")
clang_path =
rebase_path("${fuchsia_toolchain_path}/lib/aarch64-unknown-fuchsia/c++")
} else {
assert(false, "Unknown target cpu for Fuchsia target.")
}

10
gn/BUILD.gn
View File

@ -4,7 +4,7 @@
# found in the LICENSE file.
if (is_fuchsia) {
import ("//build/fuchsia/sdk.gni")
import("//build/fuchsia/sdk.gni")
}
declare_args() {
@ -61,8 +61,12 @@ config("default") {
}
if (is_fuchsia && using_fuchsia_sdk) {
ldflags += [ "-v", "--sysroot=" + rebase_path("$fuchsia_sdk_path/arch/$target_cpu/sysroot") ]
cflags += [ "--sysroot=" + rebase_path("$fuchsia_sdk_path/arch/$target_cpu/sysroot") ]
ldflags += [
"-v",
"--sysroot=" + rebase_path("$fuchsia_sdk_path/arch/$target_cpu/sysroot"),
]
cflags += [ "--sysroot=" +
rebase_path("$fuchsia_sdk_path/arch/$target_cpu/sysroot") ]
if (target_cpu == "x64") {
target_triple = "--target=x86_64-${target_os}"
} else if (target_cpu == "arm64") {

5
gn/toolchain/BUILD.gn
View File

@ -1,5 +1,5 @@
if (is_fuchsia) {
import ("//build/fuchsia/sdk.gni")
import("//build/fuchsia/sdk.gni")
}
declare_args() {
@ -23,7 +23,8 @@ declare_args() {
target_ar = rebase_path("$fuchsia_toolchain_path/bin/llvm-ar")
target_cc = rebase_path("$fuchsia_toolchain_path/bin/clang")
target_cxx = rebase_path("$fuchsia_toolchain_path/bin/clang++")
cflags = "--sysroot=" + rebase_path("$fuchsia_toolchain_path/$target_cpu/sysroot")
cflags = "--sysroot=" +
rebase_path("$fuchsia_toolchain_path/$target_cpu/sysroot")
link = rebase_path("$fuchsia_toolchain_path/bin/ld.lld")
} else {
target_ar = ar