summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-05-30 23:28:26 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-05-30 23:28:26 +0200
commit0f379730f2e8d917daab6368688f3c9b48251392 (patch)
tree09f7eb0ddcae3929be1293e46cf1347ed0249a08
parentMerge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf am: 29d9d7bbbe (diff)
parentMerge "Disable building simulator for mac" am: f3dd821f76 (diff)
downloadandroid_bootable_recovery-0f379730f2e8d917daab6368688f3c9b48251392.tar
android_bootable_recovery-0f379730f2e8d917daab6368688f3c9b48251392.tar.gz
android_bootable_recovery-0f379730f2e8d917daab6368688f3c9b48251392.tar.bz2
android_bootable_recovery-0f379730f2e8d917daab6368688f3c9b48251392.tar.lz
android_bootable_recovery-0f379730f2e8d917daab6368688f3c9b48251392.tar.xz
android_bootable_recovery-0f379730f2e8d917daab6368688f3c9b48251392.tar.zst
android_bootable_recovery-0f379730f2e8d917daab6368688f3c9b48251392.zip
-rw-r--r--updater/Android.bp12
-rw-r--r--updater/Android.mk1
2 files changed, 13 insertions, 0 deletions
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