Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 298baafd authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit '89897723':
  core: OSX: Support 10.9 SDK as well
parents d385a64f 89897723

core/combo/mac_version.mk

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ ifndef build_mac_version 


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)),)

mac_sdk_version := $(MAC_SDK_VERSION)

ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),)