diff options
| author | Colin Cross <ccross@android.com> | 2022-03-08 15:12:50 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2022-04-05 18:37:43 +0000 |
| commit | 895915708d6fabdaffc7d30fc2a9eb932127c265 (patch) | |
| tree | 26d0efd7b83567db217d2ab094fb2e34063d2588 | |
| parent | dab5097766d63e395dbf49afa74907af7ba9d310 (diff) | |
| download | skia-895915708d6fabdaffc7d30fc2a9eb932127c265.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: 223257095
Test: m checkbuild
Test: m USE_HOST_MUSL=true host-native
Change-Id: Ie2067df4271558a0a2dc67e947d027c32f7db9ca
Merged-In: I5fdb6aaddee72faf6948aedd145b04691c342f97
Merged-In: I7cfffc3e914e1c66ce9f794139253b4e4eaafbd4
| -rw-r--r-- | Android.bp | 2 | ||||
| -rwxr-xr-x | gn/gn_to_bp.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 4ff77a7667..4f10c94b2c 100644 --- a/Android.bp +++ b/Android.bp @@ -1727,7 +1727,7 @@ cc_library_static { "android", ], }, - linux_glibc: { + host_linux: { cflags: [ "-mssse3", ], diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 51f3b54f00..a7a6775620 100755 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -176,7 +176,7 @@ cc_library_static { "android", ], }, - linux_glibc: { + host_linux: { cflags: [ "-mssse3", ], |