commit ed7f31b990cca64cb7463815b95d25dd8f099fa2
author Kevin Lubick <kjlubick@google.com> Thu Oct 27 18:12:10 2022 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Oct 28 13:11:13 2022 +0000
tree 666936f07e53f134a5e1e3ba00ae6dea894d87f9
parent ae5892bde50dd4e04ad38ed069c0fea8f243d9d0

Re-enable PIE on Android+OptimizeForSize

Looks like Android executables *must* have PIE

Change-Id: Iab402041a09263627b54f302b29821ef42dbf9d6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/597157
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

gn/skia/BUILD.gn

diff --git a/gn/skia/BUILD.gn b/gn/skia/BUILD.gn
index 1811e01..f24c77f 100644
--- a/gn/skia/BUILD.gn
+++ b/gn/skia/BUILD.gn
@@ -628,12 +628,15 @@
         # We currently use bloaty 1.0 on the CI. Newer versions of Bloaty do not
         # seem to handle newer DWARF data as well.
         "-gdwarf-4",
-
-        # Clang 15 turns PIE (Position-indendendent Executable) on by default.
-        "-fno-PIE",
-        "-fno-pie",
       ]
-      ldflags += [ "-nopie" ]
+      if (!is_android) {
+        cflags += [
+          # Clang 15 turns PIE (Position-indendendent Executable) on by default.
+          "-fno-PIE",
+          "-fno-pie",
+        ]
+        ldflags += [ "-nopie" ]
+      }
     } else {
       cflags = [ "-O3" ]
     }