StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 3a2b9f0a to lmp-mr1-dev-plus-aosp

Browse Source 
Change-Id: I2e09a3845d48bc52eca49cb7913f85960e0d9db8
This commit is contained in:
Ying Wang
2014-10-20 17:51:50 -07:00
parent 94d4214094 3a2b9f0a49
commit 89897723ea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/combo/mac_version.mk
View File

@@ -9,7 +9,7 @@ ifndef build_mac_version
build_mac_version := $(shell sw_vers -productVersion) build_mac_version := $(shell sw_vers -productVersion)
mac_sdk_versions_supported := 10.6 10.7 10.8 mac_sdk_versions_supported := 10.6 10.7 10.8 10.9
ifneq ($(strip $(MAC_SDK_VERSION)),) ifneq ($(strip $(MAC_SDK_VERSION)),)
mac_sdk_version := $(MAC_SDK_VERSION) mac_sdk_version := $(MAC_SDK_VERSION)
ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),) ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),)