From 76e165d143ea1486382371e008e3bd66c4da4bce Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Thu, 30 May 2019 10:24:47 -0700 Subject: Disable building simulator for mac Disable building the simulator and its support libraries to resolve the breakage on mac host targets. Because the simulator is not intended to use on mac anyway. Bug: 134047992 Test: mma Change-Id: I488ab50cab1282f03250010b5334f1895d44f98b --- updater/Android.bp | 12 ++++++++++++ updater/Android.mk | 1 + 2 files changed, 13 insertions(+) diff --git a/updater/Android.bp b/updater/Android.bp index a66155b3a..b279068a8 100644 --- a/updater/Android.bp +++ b/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", ], diff --git a/updater/Android.mk b/updater/Android.mk index b8b5e5a70..e969d1c80 100644 --- a/updater/Android.mk +++ b/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 -- cgit v1.2.3