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

am: b93dc08bc6

Change-Id: I1b191e246349299a381ee5cec9bf15fad99bea5c

updater/Android.bp

@@ -81,6 +81,12 @@ cc_library_static {
         "updater.cpp",
     ],
 
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+
     export_include_dirs: [
         "include",
     ],
@@ -131,6 +137,12 @@ cc_library_host_static {
         "libfstab",
     ],
 
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
+
     export_include_dirs: [
         "include",
     ],

updater/Android.mk

@@ -118,6 +118,7 @@ include $(BUILD_EXECUTABLE)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := update_host_simulator
+LOCAL_MODULE_HOST_OS := linux
 
 LOCAL_SRC_FILES := \
     update_simulator_main.cpp