aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@google.com>2022-03-18 10:12:38 -0700
committerSkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com>2022-04-04 14:19:54 +0000
commit9659252ba27aa5c6b26c947cbf703644618a4a99 (patch)
tree4eb84928b35c924cbf09e2660f0c32b8c9714d9c
parenta357a11f7456651320f57599f44cee8e49a57104 (diff)
downloadskia-9659252ba27aa5c6b26c947cbf703644618a4a99.tar.gz
Tweak linux_glibc properties for musl builds in external/skia
For convenience, builds against musl libc currently use the linux_glibc properties because they are almost always linux-specific and not glibc-specific. In preparation for removing this hack, tweak the linux_glibc properties by either moving them to host_linux, which will apply to linux_glibc, linux_musl and linux_bionic, or by setting appropriate musl or linux_musl properties. Properties that must not be repeated while musl uses linux_musl and also still uses the linux_glibc properties are moved to glibc properties, which don't apply to musl. Whether these stay as glibc properties or get moved back to linux_glibc later once the musl hack is removed is TBD. Bug: b/223257095 Test: m checkbuild Test: m USE_HOST_MUSL=true host-native Change-Id: Ie2067df4271558a0a2dc67e947d027c32f7db9ca Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521361 Reviewed-by: Kevin Lubick <kjlubick@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com> Commit-Queue: Leon Scroggins <scroggo@google.com> (cherry picked from commit 350ce03adc5fd61bc6122edb8275319a9125273b) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/527059 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com>
-rwxr-xr-xgn/gn_to_bp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index b49ab11c17..f7302d00cb 100755
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -180,7 +180,7 @@ cc_library_static {
"android",
],
},
- linux_glibc: {
+ host_linux: {
srcs: [
$linux_srcs
],