commit a3cbaeee7786f2ffb5d6bdc9e6620599bc8c7c4f
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Thu Nov 14 23:09:22 2019 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Thu Nov 14 23:09:22 2019 +0000
tree 19d29ad8ebdc845dfca219f17f6993f34de2d8c9
parent a05146e13c3b5707d60acddf9abd9692ea3c7af3
parent 8a8a1fdd5b238fc27c900598ae8436deb3acf75a

Snap for 6008936 from 8a8a1fdd5b238fc27c900598ae8436deb3acf75a to r-keystone-qcom-release

Change-Id: I09894588167e2f61f7f1dc38f771d883e3d52693

Android.bp

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",
+            ],
+        },
+    },
 }