DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I230fca720c4855a846df7638da93ce9fb0d2ce5f
diff --git a/Android.bp b/Android.bp
index 361a7ee..1c9a4ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,14 +28,18 @@
         "-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 @@
             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",
+            ],
+        },
+    },
 }