commit b93dc08bc68fa3b551364aead2821dc0b9419c12
author Tianjie Xu <xunchang@google.com> Thu May 30 14:17:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 30 14:17:05 2019 -0700
tree 09f7eb0ddcae3929be1293e46cf1347ed0249a08
parent 55e82e2fc5f614ec4a725f5059b4cd02f86b2d55
parent 3489b274d02023e46956a84efe4f42c1b35703ec

Merge "Disable building simulator for mac" am: f3dd821f76
am: 3489b274d0

Change-Id: Idfe10693ecc07e4721bf32e1a7a914feb69f2dec

updater/Android.bp

diff --git a/updater/Android.bp b/updater/Android.bp
index a66155b..b279068 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -81,6 +81,12 @@
         "updater.cpp",
     ],
 
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+
     export_include_dirs: [
         "include",
     ],
@@ -131,6 +137,12 @@
         "libfstab",
     ],
 
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+
     export_include_dirs: [
         "include",
     ],

updater/Android.mk

diff --git a/updater/Android.mk b/updater/Android.mk
index b8b5e5a..e969d1c 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -118,6 +118,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := update_host_simulator
+LOCAL_MODULE_HOST_OS := linux
 
 LOCAL_SRC_FILES := \
     update_simulator_main.cpp