organicmaps/gflags
13
Fork 0
mirror of https://github.com/gflags/gflags.git synced 2025-04-04 13:05:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Android linking fix (#321)

Browse source
This commit is contained in:
Michael Chinen 2022-01-08 15:02:39 -08:00 • committed by GitHub
parent 4ace06d024
commit 9ca7e9ee7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
BUILD
View file

@ -4,14 +4,22 @@
licenses(["notice"]) licenses(["notice"])
exports_files(["src/gflags_completions.sh", "COPYING.txt"]) exports_files([
"src/gflags_completions.sh",
"COPYING.txt",
])
config_setting( config_setting(
name = "x64_windows", name = "x64_windows",
values = {"cpu": "x64_windows"}, values = {"cpu": "x64_windows"},
) )
load(":bazel/gflags.bzl", "gflags_sources", "gflags_library") config_setting(
name = "android",
values = {"crosstool_top": "//external:android/crosstool"},
)
load(":bazel/gflags.bzl", "gflags_library", "gflags_sources")
(hdrs, srcs) = gflags_sources(namespace=["google", "gflags"]) (hdrs, srcs) = gflags_sources(namespace=["google", "gflags"])
gflags_library(hdrs=hdrs, srcs=srcs, threads=0) gflags_library(hdrs=hdrs, srcs=srcs, threads=0)

26
bazel/gflags.bzl
View file

@ -1,7 +1,8 @@
load("//bazel/expanded_template:expanded_template.bzl", "expanded_template") load("//bazel/expanded_template:expanded_template.bzl", "expanded_template")
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Add native rules to configure source files # Add native rules to configure source files
def gflags_sources(namespace=["google", "gflags"]): def gflags_sources(namespace = ["google", "gflags"]):
expanded_template( expanded_template(
name = "gflags_declare_h", name = "gflags_declare_h",
template = "src/gflags_declare.h.in", template = "src/gflags_declare.h.in",
@ -16,13 +17,13 @@ def gflags_sources(namespace=["google", "gflags"]):
for ns in namespace[1:]: for ns in namespace[1:]:
gflags_ns_h_file = "gflags_{}.h".format(ns) gflags_ns_h_file = "gflags_{}.h".format(ns)
expanded_template( expanded_template(
name = gflags_ns_h_file.replace('.', '_'), name = gflags_ns_h_file.replace(".", "_"),
template = "src/gflags_ns.h.in", template = "src/gflags_ns.h.in",
out = gflags_ns_h_file, out = gflags_ns_h_file,
substitutions = { substitutions = {
"@ns@": ns, "@ns@": ns,
"@NS@": ns.upper(), "@NS@": ns.upper(),
} },
) )
gflags_ns_h_files.append(gflags_ns_h_file) gflags_ns_h_files.append(gflags_ns_h_file)
expanded_template( expanded_template(
@ -31,7 +32,7 @@ def gflags_sources(namespace=["google", "gflags"]):
out = "gflags.h", out = "gflags.h",
substitutions = { substitutions = {
"@GFLAGS_ATTRIBUTE_UNUSED@": "", "@GFLAGS_ATTRIBUTE_UNUSED@": "",
"@INCLUDE_GFLAGS_NS_H@": '\n'.join(["#include \"gflags/{}\"".format(hdr) for hdr in gflags_ns_h_files]), "@INCLUDE_GFLAGS_NS_H@": "\n".join(["#include \"gflags/{}\"".format(hdr) for hdr in gflags_ns_h_files]),
}, },
) )
expanded_template( expanded_template(
@ -43,7 +44,7 @@ def gflags_sources(namespace=["google", "gflags"]):
}, },
) )
hdrs = [":gflags_h", ":gflags_declare_h", ":gflags_completions_h"] hdrs = [":gflags_h", ":gflags_declare_h", ":gflags_completions_h"]
hdrs.extend([':' + hdr.replace('.', '_') for hdr in gflags_ns_h_files]) hdrs.extend([":" + hdr.replace(".", "_") for hdr in gflags_ns_h_files])
srcs = [ srcs = [
"src/config.h", "src/config.h",
"src/gflags.cc", "src/gflags.cc",
@ -62,7 +63,7 @@ def gflags_sources(namespace=["google", "gflags"]):
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Add native rule to build gflags library # Add native rule to build gflags library
def gflags_library(hdrs=[], srcs=[], threads=1): def gflags_library(hdrs = [], srcs = [], threads = 1):
name = "gflags" name = "gflags"
copts = [ copts = [
"-DGFLAGS_BAZEL_BUILD", "-DGFLAGS_BAZEL_BUILD",
@ -89,6 +90,7 @@ def gflags_library(hdrs=[], srcs=[], threads=1):
linkopts = [] linkopts = []
if threads: if threads:
linkopts += select({ linkopts += select({
"//:android": [],
"//:x64_windows": [], "//:x64_windows": [],
"//conditions:default": ["-lpthread"], "//conditions:default": ["-lpthread"],
}) })
@ -96,11 +98,11 @@ def gflags_library(hdrs=[], srcs=[], threads=1):
name += "_nothreads" name += "_nothreads"
copts += ["-DNO_THREADS"] copts += ["-DNO_THREADS"]
native.cc_library( native.cc_library(
name = name, name = name,
hdrs = hdrs, hdrs = hdrs,
srcs = srcs, srcs = srcs,
copts = copts, copts = copts,
linkopts = linkopts, linkopts = linkopts,
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
include_prefix = 'gflags' include_prefix = "gflags",
) )