commit 0aa895e6dfc491ca26acb46192d221e6b6675403
author Jerome Gaillard <jgaillard@google.com> Thu Nov 29 15:32:07 2018 +0000
committer Jerome Gaillard <jgaillard@google.com> Thu Nov 29 15:32:07 2018 +0000
tree 8b14ea4db4d4966dbc0f3a0ce15749446be04037
parent faaabc9c95ffbe83fab70606108071ae923db97f

Enable libjpeg for Windows

This is needed to use skia in Android Studio for Windows.

Test: sdk build
Change-Id: I789c80ed9b2f4bfca4efaa1e2df0e9fe3f8db525

Android.bp

diff --git a/Android.bp b/Android.bp
index f69f64e..d2772ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -200,6 +200,16 @@
                 "-DMACHO",
             ],
         },
+        windows_x86: {
+            asflags: [
+                "-DWIN32",
+            ],
+        },
+        windows_x86_64: {
+            asflags: [
+                "-DWIN64",
+            ],
+        },
     },
     xom: false,
 }
@@ -214,6 +224,11 @@
     },
     defaults: ["libjpeg-defaults"],
     export_include_dirs: ["."],
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 // Build static library against the NDK