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

Commit 14350c57 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use the soong-built NDK CRT objects."

parents 08dcccb1 f9f035de

core/binary.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -181,6 +181,8 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    my_ndk_api := $(call math_max,$(my_ndk_api),$(my_min_sdk_version))

    my_ndk_api := $(call math_max,$(my_ndk_api),$(my_min_sdk_version))

  endif

  endif





  my_ndk_crt_version := $(my_ndk_api)



  my_ndk_hist_api := $(my_ndk_api)

  my_ndk_hist_api := $(my_ndk_api)

  ifeq ($(my_ndk_api),current)

  ifeq ($(my_ndk_api),current)

    # The last API level supported by the old prebuilt NDKs.

    # The last API level supported by the old prebuilt NDKs.

core/executable_internal.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -56,9 +56,9 @@ my_target_crtbegin_static_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT 
my_target_crtend_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_android)

my_target_crtend_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_android)

endif

endif

ifneq ($(LOCAL_SDK_VERSION),)

ifneq ($(LOCAL_SDK_VERSION),)

my_target_crtbegin_dynamic_o := $(wildcard $(my_ndk_sysroot_lib)/crtbegin_dynamic.o)

my_target_crtbegin_dynamic_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtbegin_dynamic.sdk.$(my_ndk_crt_version))

my_target_crtbegin_static_o := $(wildcard $(my_ndk_sysroot_lib)/crtbegin_static.o)

my_target_crtbegin_static_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtbegin_static.sdk.$(my_ndk_crt_version))

my_target_crtend_o := $(wildcard $(my_ndk_sysroot_lib)/crtend_android.o)

my_target_crtend_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_android.sdk.$(my_ndk_crt_version))

endif

endif

$(linked_module): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins)

$(linked_module): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins)

$(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)

$(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)

core/shared_library_internal.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -51,8 +51,8 @@ my_target_crtbegin_so_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crt 
my_target_crtend_so_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_so)

my_target_crtend_so_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_so)

endif

endif

ifneq ($(LOCAL_SDK_VERSION),)

ifneq ($(LOCAL_SDK_VERSION),)

my_target_crtbegin_so_o := $(wildcard $(my_ndk_sysroot_lib)/crtbegin_so.o)

my_target_crtbegin_so_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtbegin_so.sdk.$(my_ndk_crt_version))

my_target_crtend_so_o := $(wildcard $(my_ndk_sysroot_lib)/crtend_so.o)

my_target_crtend_so_o := $(SOONG_$(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJECT_crtend_so.sdk.$(my_ndk_crt_version))

endif

endif

$(linked_module): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins)

$(linked_module): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins)

$(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)

$(linked_module): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)