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

Commit 66a4ef8f authored by Andrew Hsieh's avatar Andrew Hsieh Committed by Android Git Automerger
Browse files

am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared" 

* commit 'd14f3cc7':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
parents ce418783 d14f3cc7

core/binary.mk

+20 −3
Original line number Original line Diff line number Diff line
@@ -22,10 +22,12 @@ ifdef LOCAL_SDK_VERSION 
  my_ndk_stl_shared_lib_fullpath :=

  my_ndk_stl_shared_lib_fullpath :=

  my_ndk_stl_shared_lib :=

  my_ndk_stl_shared_lib :=

  my_ndk_stl_static_lib :=

  my_ndk_stl_static_lib :=

  my_ndk_stl_cppflags :=

  LOCAL_NDK_STL_VARIANT := $(strip $(LOCAL_NDK_STL_VARIANT))

  ifeq (,$(LOCAL_NDK_STL_VARIANT))

  ifeq (,$(LOCAL_NDK_STL_VARIANT))

    LOCAL_NDK_STL_VARIANT := system

    LOCAL_NDK_STL_VARIANT := system

  endif

  endif

  ifneq (1,$(words $(filter system stlport_static stlport_shared gnustl_static, $(LOCAL_NDK_STL_VARIANT))))

  ifneq (1,$(words $(filter system stlport_static stlport_shared c++_static c++_shared gnustl_static, $(LOCAL_NDK_STL_VARIANT))))

    $(error $(LOCAL_PATH): Unknown LOCAL_NDK_STL_VARIANT $(LOCAL_NDK_STL_VARIANT))

    $(error $(LOCAL_PATH): Unknown LOCAL_NDK_STL_VARIANT $(LOCAL_NDK_STL_VARIANT))

  endif

  endif

  ifeq (system,$(LOCAL_NDK_STL_VARIANT))

  ifeq (system,$(LOCAL_NDK_STL_VARIANT))
@@ -40,6 +42,18 @@ ifdef LOCAL_SDK_VERSION 
      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/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libstlport_shared.so

      my_ndk_stl_shared_lib := -lstlport_shared

      my_ndk_stl_shared_lib := -lstlport_shared

    endif

    endif

  else # LOCAL_NDK_STL_VARIANT is not stlport_* either

  ifneq (,$(filter c++_%, $(LOCAL_NDK_STL_VARIANT)))

    my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libcxx/include \

                               $(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

    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 := -lc++_shared

    endif

    my_ndk_stl_cppflags := -std=c++11

  else

  else

    # LOCAL_NDK_STL_VARIANT is gnustl_static

    # LOCAL_NDK_STL_VARIANT is gnustl_static

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

    my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/include \
@@ -48,6 +62,7 @@ ifdef LOCAL_SDK_VERSION 
  endif

  endif

  endif

  endif

  endif

  endif

endif





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

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

# Compute the dependency of the shared libraries

# Compute the dependency of the shared libraries
@@ -181,19 +196,21 @@ ifndef LOCAL_IS_HOST_MODULE 
ifdef LOCAL_SDK_VERSION

ifdef LOCAL_SDK_VERSION

my_target_project_includes :=

my_target_project_includes :=

my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include

my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include

my_target_global_cppflags := $(my_ndk_stl_cppflags)

else

else

my_target_project_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_INCLUDES)

my_target_project_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_INCLUDES)

my_target_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_C_INCLUDES)

my_target_c_includes := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_C_INCLUDES)

my_target_global_cppflags :=

endif # LOCAL_SDK_VERSION

endif # LOCAL_SDK_VERSION





ifeq ($(LOCAL_CLANG),true)

ifeq ($(LOCAL_CLANG),true)

my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CFLAGS)

my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CFLAGS)

my_target_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CPPFLAGS)

my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CPPFLAGS)

my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)

my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)

my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES)

my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES)

else

else

my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CFLAGS)

my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CFLAGS)

my_target_global_cppflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CPPFLAGS)

my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CPPFLAGS)

my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS)

my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS)

endif # LOCAL_CLANG

endif # LOCAL_CLANG

core/package_internal.mk

+8 −1
Original line number Original line Diff line number Diff line
@@ -315,13 +315,20 @@ endif 
# App explicitly requires the prebuilt NDK libstlport_shared.so.

# App explicitly requires the prebuilt NDK libstlport_shared.so.

# libstlport_shared.so should never go to the system image.

# libstlport_shared.so should never go to the system image.

# Instead it should be packaged into the apk.

# Instead it should be packaged into the apk.

ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT))

ifneq ($(filter $(LOCAL_NDK_STL_VARIANT), stlport_shared c++_shared),)

ifndef LOCAL_SDK_VERSION

ifndef LOCAL_SDK_VERSION

$(error LOCAL_SDK_VERSION has to be defined together with LOCAL_NDK_STL_VARIANT, \

$(error LOCAL_SDK_VERSION has to be defined together with LOCAL_NDK_STL_VARIANT, \

    LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME))

    LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME))

endif

endif

endif

ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT))

jni_shared_libraries += \

jni_shared_libraries += \

    $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/stlport/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libstlport_shared.so

    $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/stlport/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libstlport_shared.so

else

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

jni_shared_libraries += \

    $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/llvm-libc++/libs/$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)/libc++_shared.so

endif

endif

endif





# Set the abi directory used by the local JNI shared libraries.

# Set the abi directory used by the local JNI shared libraries.