commit ffc4c06b67b3a377370dd8c0d08ea0870e2ec501
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 05 06:23:23 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 05 06:23:23 2018 +0000
tree 81f52fe269e6f7ff0826e107e821e7af0bde84b0
parent 789abf634411f23f9f2a4fe9762e50a88ccbd34a
parent a1352904169946fe7cf0541e6e46a70302c2073a

Snap for 5163676 from a1352904169946fe7cf0541e6e46a70302c2073a to qt-release

Change-Id: I67190d87c5858926dfa1f54b56f2a74c30dc1c11

Android.bp

diff --git a/Android.bp b/Android.bp
index c78ecb5..df3dde6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,9 +45,6 @@
         "-Wall",
         "-Werror",
 
-        "-fPIC",
-        "-DPIC",
-
         "-DDARWIN_NO_CARBON",
         "-DFT2_BUILD_LIBRARY",
 
@@ -66,6 +63,24 @@
         "libpng",
         "libz",
     ],
+
+    target: {
+        android: {
+            cflags: [
+                "-fPIC",
+                "-DPIC",
+            ],
+        },
+        not_windows: {
+            cflags: [
+                "-fPIC",
+                "-DPIC",
+            ],
+        },
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 llndk_library {