Merge "Switch to SDK_HOST_ARCH"
This commit is contained in:
@@ -65,8 +65,8 @@ WIN_BUILD_PREREQ := \
|
|||||||
|
|
||||||
|
|
||||||
# MAIN_SDK_NAME/DIR is set in build/core/Makefile
|
# MAIN_SDK_NAME/DIR is set in build/core/Makefile
|
||||||
WIN_SDK_NAME := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(MAIN_SDK_NAME))
|
WIN_SDK_NAME := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_NAME))
|
||||||
WIN_SDK_DIR := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(MAIN_SDK_DIR))
|
WIN_SDK_DIR := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_DIR))
|
||||||
WIN_SDK_ZIP := $(WIN_SDK_DIR)/$(WIN_SDK_NAME).zip
|
WIN_SDK_ZIP := $(WIN_SDK_DIR)/$(WIN_SDK_NAME).zip
|
||||||
|
|
||||||
$(call dist-for-goals, win_sdk, $(WIN_SDK_ZIP))
|
$(call dist-for-goals, win_sdk, $(WIN_SDK_ZIP))
|
||||||
|
|||||||
@@ -14,8 +14,8 @@
|
|||||||
|
|
||||||
LOCAL_PATH := $(call my-dir)
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
|
||||||
supported_platforms := linux-x86
|
supported_platforms := linux
|
||||||
cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
|
cur_platform := $(filter $(HOST_OS),$(supported_platforms))
|
||||||
|
|
||||||
ifdef cur_platform
|
ifdef cur_platform
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user