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

Commit 7e793040 authored by Ben Cheng's avatar Ben Cheng Committed by Android Git Automerger
Browse files

am eec11d97: Merge "Decouple platform compiler and NDK library versioning." 

* commit 'eec11d97':
  Decouple platform compiler and NDK library versioning.
parents 3221717f eec11d97

core/binary.mk

+3 −3
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ ifdef LOCAL_SDK_VERSION 
    my_ndk_stl_cppflags := -std=c++11

  else

    # LOCAL_NDK_STL_VARIANT is gnustl_static

    my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GCC_VERSION)/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/include \

                               $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GCC_VERSION)/include

    my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GCC_VERSION)/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libgnustl_static.a

    my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/include \

                               $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/include

    my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libgnustl_static.a

  endif

  endif

  endif

core/combo/TARGET_linux-arm.mk

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) 
TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te

endif



# Decouple NDK library selection with platform compiler version

$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8



ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)

$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8

else

core/combo/TARGET_linux-arm64.mk

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := armv8

endif



# Decouple NDK library selection with platform compiler version

TARGET_NDK_GCC_VERSION := 4.8



ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)

TARGET_GCC_VERSION := 4.8

else

core/combo/TARGET_linux-mips.mk

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) 
TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := mips32r2-fp

endif



# Decouple NDK library selection with platform compiler version

$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8



ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)

$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8

else

core/combo/TARGET_linux-mips64.mk

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := mips64r2

endif



# Decouple NDK library selection with platform compiler version

TARGET_NDK_GCC_VERSION := 4.8



ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)

TARGET_GCC_VERSION := 4.8

else