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

Commit 17967eb7 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"

parents 62d49dc5 1a074874

core/binary.mk

+12 −6
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ ifdef LOCAL_SDK_VERSION 
  my_ndk_sysroot_include := $(my_ndk_sysroot)/usr/include

  ifeq (x86_64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

    my_ndk_sysroot_lib := $(my_ndk_sysroot)/usr/lib64

  else ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT))

    my_ndk_sysroot_lib := $(my_ndk_sysroot)/usr/libr6

  else

    my_ndk_sysroot_lib := $(my_ndk_sysroot)/usr/lib

  endif
@@ -88,6 +90,10 @@ ifdef LOCAL_SDK_VERSION 
  my_ndk_stl_shared_lib :=

  my_ndk_stl_static_lib :=

  my_ndk_stl_cppflags :=

  my_cpu_variant := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)

  ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT))

    my_cpu_variant := mips32r6

  endif

  LOCAL_NDK_STL_VARIANT := $(strip $(LOCAL_NDK_STL_VARIANT))

  ifeq (,$(LOCAL_NDK_STL_VARIANT))

    LOCAL_NDK_STL_VARIANT := system
@@ -102,9 +108,9 @@ ifdef LOCAL_SDK_VERSION 
  ifneq (,$(filter stlport_%, $(LOCAL_NDK_STL_VARIANT)))

    my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/stlport/stlport

    ifeq (stlport_static,$(LOCAL_NDK_STL_VARIANT))

      my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/stlport/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libstlport_static.a

      my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/stlport/libs/$(my_cpu_variant)/libstlport_static.a

    else

      my_ndk_stl_shared_lib_fullpath := $(my_ndk_source_root)/cxx-stl/stlport/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libstlport_shared.so

      my_ndk_stl_shared_lib_fullpath := $(my_ndk_source_root)/cxx-stl/stlport/libs/$(my_cpu_variant)/libstlport_shared.so

      my_ndk_stl_shared_lib := -lstlport_shared

    endif

  else # LOCAL_NDK_STL_VARIANT is not stlport_* either
@@ -113,17 +119,17 @@ ifdef LOCAL_SDK_VERSION 
                               $(my_ndk_source_root)/cxx-stl/llvm-libc++/gabi++/include \

                               $(my_ndk_source_root)/android/support/include

    ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT))

      my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libc++_static.a

      my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(my_cpu_variant)/libc++_static.a

    else

      my_ndk_stl_shared_lib_fullpath := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libc++_shared.so

      my_ndk_stl_shared_lib_fullpath := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(my_cpu_variant)/libc++_shared.so

      my_ndk_stl_shared_lib := -lc++_shared

    endif

    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_NDK_GCC_VERSION)/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/include \

    my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/libs/$(my_cpu_variant)/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

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

  endif

  endif

  endif

core/combo/TARGET_linux-mips.mk

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

$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9



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

$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9

core/combo/TARGET_linux-mips64.mk

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
# Included by combo/select.mk



# You can set TARGET_ARCH_VARIANT to use an arch version other

# than mips64. Each value should correspond to a file named

# than mips64r6. Each value should correspond to a file named

# $(BUILD_COMBOS)/arch/<name>.mk which must contain

# makefile variable definitions similar to the preprocessor

# defines in build/core/combo/include/arch/<combo>/AndroidConfig.h. Their
@@ -35,7 +35,7 @@ TARGET_ARCH_VARIANT := mips64r6 
endif



# Decouple NDK library selection with platform compiler version

TARGET_NDK_GCC_VERSION := 4.8

TARGET_NDK_GCC_VERSION := 4.9



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

TARGET_GCC_VERSION := 4.9