commit 21b381622d39b3d9ce1eaee674659922ff66fa1b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 23 17:04:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 23 17:04:34 2018 +0000
tree 925cbe149c20711f1bec575e91ca9beed31ac59a
parent bf52b7e00b63397d9c81b7f7ffa7a8b8799edd4a
parent 1cfb36112901eaf44110d8a29355c3116bee4a3a

Merge "Replace vfork() with fork()."

applypatch/Android.bp

diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index d3efa15..cb0b367 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -57,6 +57,12 @@
         "libotautil",
         "libz",
     ],
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }
 
 cc_library_static {

otafault/Android.bp

diff --git a/otafault/Android.bp b/otafault/Android.bp
index 30d5610..b39d5be 100644
--- a/otafault/Android.bp
+++ b/otafault/Android.bp
@@ -39,6 +39,12 @@
         "-Wthread-safety",
         "-Wthread-safety-negative",
     ],
+
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }
 
 cc_test {

tools/recovery_l10n/Android.mk

diff --git a/tools/recovery_l10n/Android.mk b/tools/recovery_l10n/Android.mk
index 937abd1..7197c5c 100644
--- a/tools/recovery_l10n/Android.mk
+++ b/tools/recovery_l10n/Android.mk
@@ -5,6 +5,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_PACKAGE_NAME := RecoveryLocalizer
+LOCAL_SDK_VERSION := current
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)