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

Commit 89897723 authored by Ying Wang's avatar Ying Wang
Browse files

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

Change-Id: I2e09a3845d48bc52eca49cb7913f85960e0d9db8
parents 94d42140 3a2b9f0a

core/combo/mac_version.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)),)