build: apply gn format
Change-Id: I810fff100d8932b80c63df6f13a91d8224d6ea4d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6308024 Commit-Queue: Junji Watanabe <jwata@google.com> Reviewed-by: Junji Watanabe <jwata@google.com> Auto-Submit: Takuto Ikuta <tikuta@chromium.org> Cr-Commit-Position: refs/heads/main@{#1425651}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
c38a473273
commit
1b4222b5ce
build
@@ -16,7 +16,7 @@ android_library("bootstrap_java") {
|
|||||||
]
|
]
|
||||||
deps = [ "third_party/AndroidHiddenApiBypass:hidden_api_bypass_java" ]
|
deps = [ "third_party/AndroidHiddenApiBypass:hidden_api_bypass_java" ]
|
||||||
jacoco_never_instrument = true
|
jacoco_never_instrument = true
|
||||||
chromium_code = false # Disable build_java default dep.
|
chromium_code = false # Disable build_java default dep.
|
||||||
}
|
}
|
||||||
|
|
||||||
dist_dex("apk_dex") {
|
dist_dex("apk_dex") {
|
||||||
|
@@ -2299,8 +2299,7 @@ config("export_dynamic") {
|
|||||||
# 2. Remove the thin_archive config, so that the .a file actually contains all
|
# 2. Remove the thin_archive config, so that the .a file actually contains all
|
||||||
# .o files, instead of just references to .o files in the build directoy
|
# .o files, instead of just references to .o files in the build directoy
|
||||||
config("thin_archive") {
|
config("thin_archive") {
|
||||||
if ((is_apple && use_lld) || (is_linux && !is_clang) ||
|
if ((is_apple && use_lld) || (is_linux && !is_clang) || current_os == "aix") {
|
||||||
current_os == "aix") {
|
|
||||||
# The macOS and iOS linker ld64.ldd doesn't support thin archive without
|
# The macOS and iOS linker ld64.ldd doesn't support thin archive without
|
||||||
# symbol table, gcc on linux also throws the error `archive has no index`.
|
# symbol table, gcc on linux also throws the error `archive has no index`.
|
||||||
# AIX does support -s option, not -S option.
|
# AIX does support -s option, not -S option.
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
import("//build/shim_headers.gni")
|
import("//build/shim_headers.gni")
|
||||||
|
|
||||||
|
|
||||||
config("flatbuffers_config") {
|
config("flatbuffers_config") {
|
||||||
include_dirs = [ "src/include" ]
|
include_dirs = [ "src/include" ]
|
||||||
|
|
||||||
@@ -31,4 +30,5 @@ copy("flatc") {
|
|||||||
outputs = [ "$root_out_dir/flatc" ]
|
outputs = [ "$root_out_dir/flatc" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("flatbuffers_unittests") {}
|
source_set("flatbuffers_unittests") {
|
||||||
|
}
|
||||||
|
@@ -7,14 +7,10 @@ pkg_config("system_libusb") {
|
|||||||
|
|
||||||
shim_headers("libusb_shim") {
|
shim_headers("libusb_shim") {
|
||||||
root_path = "src/libusb"
|
root_path = "src/libusb"
|
||||||
headers = [
|
headers = [ "libusb.h" ]
|
||||||
"libusb.h",
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("libusb") {
|
source_set("libusb") {
|
||||||
deps = [
|
deps = [ ":libusb_shim" ]
|
||||||
":libusb_shim",
|
|
||||||
]
|
|
||||||
public_configs = [ ":system_libusb" ]
|
public_configs = [ ":system_libusb" ]
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
config("vulkan_memory_allocator_config") {
|
config("vulkan_memory_allocator_config") {
|
||||||
libs = ["VulkanMemoryAllocator"]
|
libs = [ "VulkanMemoryAllocator" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("vulkan_memory_allocator") {
|
source_set("vulkan_memory_allocator") {
|
||||||
|
@@ -30,7 +30,8 @@ template("shim_headers") {
|
|||||||
|
|
||||||
outputs = []
|
outputs = []
|
||||||
foreach(h, invoker.headers) {
|
foreach(h, invoker.headers) {
|
||||||
outputs += [ shim_headers_path + "/" + rebase_path(invoker.root_path,"//") + "/" + h ]
|
outputs += [ shim_headers_path + "/" +
|
||||||
|
rebase_path(invoker.root_path, "//") + "/" + h ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user