LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"

Browse Source 
* commit '1e1b10acd152ae67670587ef1682ba6a3ed8a66c':
  Switch to SDK_HOST_ARCH
This commit is contained in:
Ying Wang
2014-06-10 16:28:00 +00:00
committed by Android Git Automerger
parent 86509e1de0 1e1b10acd1
commit bcfa67e56d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/tools/windows_sdk.mk
View File

@@ -65,8 +65,8 @@ WIN_BUILD_PREREQ := \
# MAIN_SDK_NAME/DIR is set in build/core/Makefile
WIN_SDK_NAME := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(MAIN_SDK_NAME))
WIN_SDK_DIR := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(MAIN_SDK_DIR))
WIN_SDK_NAME := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_NAME))
WIN_SDK_DIR := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_DIR))
WIN_SDK_ZIP := $(WIN_SDK_DIR)/$(WIN_SDK_NAME).zip
$(call dist-for-goals, win_sdk, $(WIN_SDK_ZIP))

4
tools/elftree/Android.mk
View File

@@ -14,8 +14,8 @@
LOCAL_PATH := $(call my-dir)
supported_platforms := linux-x86
cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
supported_platforms := linux
cur_platform := $(filter $(HOST_OS),$(supported_platforms))
ifdef cur_platform