From 305b2e76e65f1851cad7401ba1a184869573bfde Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 8 Jul 2019 18:00:38 +0200 Subject: [PATCH] [sdks] Fix android sdks job It would try to execute the .stamp-android-loader-path target in unrelated configurations. --- sdks/builds/android.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdks/builds/android.mk b/sdks/builds/android.mk index 24f8469eb8a..90563b347ff 100644 --- a/sdks/builds/android.mk +++ b/sdks/builds/android.mk @@ -13,7 +13,7 @@ android_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin ifeq ($(UNAME),Darwin) android_ARCHIVE += android-sources -ADDITIONAL_PACKAGE_DEPS += $(android_SOURCES_DIR) $(android_HOST_DARWIN_LIB_DIR)/.stamp-android-loader-path +ADDITIONAL_PACKAGE_DEPS += $(android_SOURCES_DIR) endif ## @@ -250,6 +250,10 @@ _android-$(1)_CONFIGURE_FLAGS= \ $$(eval $$(call RuntimeTemplate,android,$(1))) +ifeq ($$(UNAME),Darwin) +ADDITIONAL_PACKAGE_DEPS += $$(android_HOST_DARWIN_LIB_DIR)/.stamp-android-loader-path +endif + endef # on Windows, we use the AndroidHostMxeTemplate, instead @@ -488,8 +492,6 @@ $(android_SOURCES_DIR)/external/linker/README.md: # we use this as a sentinel f $(android_SOURCES_DIR): $(android_SOURCES_DIR)/external/linker/README.md -$(android_HOST_DARWIN_LIB_DIR): $(android_HOST_DARWIN_LIB_DIR)/.stamp-android-loader-path - $(android_HOST_DARWIN_LIB_DIR)/.stamp-android-loader-path: package-android-host-Darwin $(android_PLATFORM_BIN)/install_name_tool -id @loader_path/libmonosgen-2.0.dylib $(android_HOST_DARWIN_LIB_DIR)/libmonosgen-2.0.dylib $(android_PLATFORM_BIN)/install_name_tool -change $(android_HOST_DARWIN_LIB_DIR)/libmonosgen-2.0.1.dylib @loader_path/libmonosgen-2.0.dylib $(android_HOST_DARWIN_BIN_DIR)/mono -- 2.11.4.GIT