commit f3dd821f7609723078ba9410082c5cd98b5dc80d
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 30 20:45:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 30 20:45:28 2019 +0000
tree 14308a944fde85c55d5606c6b7afc904b9879847
parent 65d7d5b8cfd25482dacb93d3960f96f252e0f91c
parent 76e165d143ea1486382371e008e3bd66c4da4bce

Merge "Disable building simulator for mac"

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