Merge "Fix mac build; add closures.c for python3" am: 46321e5e76 am: a1484ea01f am: 4ec22d7b59

am: 6db868bbee

Change-Id: Ia6429b6ebf799b5e4548a8b67248719b543649c0

1 files changed, 13 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 361a7ee4..1c9a4ec9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,14 +28,18 @@ cc_library_static {
         "-Wall",
         "-Werror",
         "-Wno-error=incompatible-pointer-types",
+        "-Wno-incompatible-pointer-types",
+        "-Wno-null-pointer-arithmetic",
         "-Wno-pointer-arith",
         "-Wno-sign-compare",
         "-Wno-unused-parameter",
+        "-Wno-unused-result",
     ],
     local_include_dirs: ["include"],
     generated_headers: ["ffi_header"],
     export_generated_headers: ["ffi_header"],
     srcs: [
+        "src/closures.c",
         "src/debug.c",
         "src/java_raw_api.c",
         "src/prep_cif.c",
@@ -81,4 +85,13 @@ cc_library_static {
             export_include_dirs: ["linux-x86_64"],
         },
     },
+    target: {
+        darwin_x86_64: {
+            exclude_srcs: ["src/x86/unix64.S"],
+            srcs: [
+                "src/x86/darwin.S",
+                "src/x86/darwin64.S",
+            ],
+        },
+    },
 }