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

Commit ee49f03f authored by Dan Willemsen's avatar Dan Willemsen
Browse files

resolve merge conflicts of e6072243 to nyc-dev-plus-aosp 

Change-Id: I659925e8169cb90eb9e6066eadd09b6789092a8d
parents b562e9db e6072243

core/combo/HOST_darwin-x86.mk

+5 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CO 
include $(BUILD_COMBOS)/mac_version.mk



$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT := prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwin_version)

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin11

$(combo_2nd_arch_prefix)HOST_CC  := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-gcc

$(combo_2nd_arch_prefix)HOST_CXX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-g++
@@ -47,7 +47,6 @@ $(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := $($(combo_2nd_arch_prefix)HO 
$(combo_2nd_arch_prefix)HOST_AR := $(AR)



$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) -DMACOSX_DEPLOYMENT_TARGET=$(mac_sdk_version)

$(combo_2nd_arch_prefix)HOST_GLOBAL_CPPFLAGS += -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1

$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)



$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -fPIC -funwind-tables
@@ -58,6 +57,10 @@ $(combo_2nd_arch_prefix)HOST_JNILIB_SUFFIX := .jnilib 


$(combo_2nd_arch_prefix)HOST_GLOBAL_ARFLAGS := cqs



# Use Darwin's libc++, as Darwin's libstdc++ is old and does not support C++11

$(combo_2nd_arch_prefix)HOST_SYSTEMCPP_CPPFLAGS := -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1

$(combo_2nd_arch_prefix)HOST_SYSTEMCPP_LDFLAGS := -stdlib=libc++



############################################################

## Macros after this line are shared by the 64-bit config.

core/combo/HOST_darwin-x86_64.mk

+5 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS 
include $(BUILD_COMBOS)/mac_version.mk



HOST_TOOLCHAIN_ROOT := prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1

HOST_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwin_version)

HOST_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin11

HOST_CC  := $(HOST_TOOLCHAIN_PREFIX)-gcc

HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)-g++
@@ -47,7 +47,6 @@ HOST_TOOLCHAIN_FOR_CLANG := $(HOST_TOOLCHAIN_ROOT) 
HOST_AR := $(AR)



HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) -DMACOSX_DEPLOYMENT_TARGET=$(mac_sdk_version)

HOST_GLOBAL_CPPFLAGS += -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1

HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)



HOST_GLOBAL_CFLAGS += -fPIC -funwind-tables
@@ -58,6 +57,10 @@ HOST_JNILIB_SUFFIX := .jnilib 


HOST_GLOBAL_ARFLAGS := cqs



# Use Darwin's libc++, as Darwin's libstdc++ is old and does not support C++11

HOST_SYSTEMCPP_CPPFLAGS := -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1

HOST_SYSTEMCPP_LDFLAGS := -stdlib=libc++



# We Reuse the following functions with the same name from HOST_darwin-x86.mk:

# transform-host-o-to-shared-lib-inner

# transform-host-o-to-executable-inner

core/combo/mac_version.mk

+0 −11
Original line number Diff line number Diff line
@@ -32,21 +32,10 @@ mac_sdk_path := $(shell xcode-select -print-path) 
#  or /Volume/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.?.sdk

mac_sdk_root := $(mac_sdk_path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(mac_sdk_version).sdk

ifeq ($(wildcard $(mac_sdk_root)),)

# try legacy /Developer/SDKs/MacOSX10.?.sdk

$(warning no SDK $(mac_sdk_version) at $(mac_sdk_root), trying legacy dir)

mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk

endif

ifeq ($(wildcard $(mac_sdk_root)),)

$(warning *****************************************************)

$(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root))

$(warning *****************************************************)

$(error Stop.)

endif



ifeq ($(mac_sdk_version),10.6)

  gcc_darwin_version := 10

else

  gcc_darwin_version := 11

endif



endif  # ifndef build_mac_version

core/cxx_stl_setup.mk

+4 −1
Original line number Diff line number Diff line
@@ -110,8 +110,11 @@ else ifeq ($(my_cxx_stl),libstdc++) 
    ifndef LOCAL_IS_HOST_MODULE

        my_c_includes += bionic/libstdc++/include

        my_system_shared_libraries += libstdc++

    else

        # Host builds will use the system C++. libc++ on Darwin, GNU libstdc++ everywhere else

        my_cppflags += $($(my_prefix)SYSTEMCPP_CPPFLAGS)

        my_ldflags += $($(my_prefix)SYSTEMCPP_LDFLAGS)

    endif

    # Host builds will use GNU libstdc++.

else ifeq ($(my_cxx_stl),none)

    ifdef LOCAL_IS_HOST_MODULE

        my_cppflags += -nostdinc++

core/ninja.mk

+4 −4
Original line number Diff line number Diff line
@@ -161,8 +161,8 @@ $(KATI_BUILD_NINJA): $(KATI) $(MAKEPARALLEL) $(SOONG_ANDROID_MK) FORCE 
	+$(hide) $(KATI_MAKEPARALLEL) $(KATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --no_ignore_dirty=$(SOONG_ANDROID_MK) --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo $(KATI_FIND_EMULATOR) -f build/core/main.mk $(KATI_GOALS) --gen_all_targets BUILDING_WITH_NINJA=true SOONG_ANDROID_MK=$(SOONG_ANDROID_MK)



ifneq ($(USE_SOONG_FOR_KATI),true)

KATI_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS)

KATI_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS)

KATI_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS) $(HOST_SYSTEMCPP_CPPFLAGS)

KATI_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS) $(HOST_SYSTEMCPP_LDFLAGS)

# Build static ckati. Unfortunately Mac OS X doesn't officially support static exectuables.

ifeq ($(BUILD_OS),linux)

# We need everything in libpthread.a otherwise C++11's threading library will be disabled.
@@ -173,8 +173,8 @@ KATI_INTERMEDIATES_PATH := $(HOST_OUT_INTERMEDIATES)/EXECUTABLES/ckati_intermedi 
KATI_BIN_PATH := $(HOST_OUT_EXECUTABLES)

include build/kati/Makefile.ckati



MAKEPARALLEL_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS)

MAKEPARALLEL_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS)

MAKEPARALLEL_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS) $(HOST_SYSTEMCPP_CPPFLAGS)

MAKEPARALLEL_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS) $(HOST_SYSTEMCPP_LDFLAGS)

# Build static makeparallel. Unfortunately Mac OS X doesn't officially support static exectuables.

ifeq ($(BUILD_OS),linux)

MAKEPARALLEL_LD += -static