aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-04-06 16:22:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-06 16:22:17 +0000
commita2c575e4e90271b9ae93bca9096886d6a26de4cc (patch)
tree26d0efd7b83567db217d2ab094fb2e34063d2588
parentfb7173eb4773023b5778b91caf5445a2a84bdf2a (diff)
parent5c0159b19981f9ddd98eff73e4742c06133cc3bd (diff)
downloadskia-a2c575e4e90271b9ae93bca9096886d6a26de4cc.tar.gz
Merge "Tweak linux_glibc properties for musl builds in external/skia" am: 19b26a5488 am: 5c0159b199
Original change: https://android-review.googlesource.com/c/platform/external/skia/+/2019597 Change-Id: I860b798f5dd2e3c4832576c657b7be227d033fda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rwxr-xr-xgn/gn_to_bp.py2
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",
],