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

Commit b2275868 authored by Stephen Hines's avatar Stephen Hines Committed by Gerrit Code Review
Browse files

Merge "Add LOCAL_NO_LIBGCC."

parents bbaeaa58 75011b20

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,nano,full 
LOCAL_PROTOC_FLAGS:=

LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=

LOCAL_NO_CRT:=

LOCAL_NO_LIBGCC:=

LOCAL_PROPRIETARY_MODULE:=

LOCAL_OEM_MODULE:=

LOCAL_ODM_MODULE:=

core/executable_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -37,7 +37,11 @@ endif 
my_target_global_ld_dirs := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LD_DIRS)

my_target_libprofile_rt := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBPROFILE_RT)

my_target_libgcov := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCOV)

ifeq ($(LOCAL_NO_LIBGCC),true)

my_target_libgcc :=

else

my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)

endif

my_target_libatomic := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBATOMIC)

my_target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_DYNAMIC_O)

my_target_crtbegin_static_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_STATIC_O)

core/shared_library_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -42,7 +42,11 @@ include $(BUILD_SYSTEM)/dynamic_binary.mk 
my_target_global_ld_dirs := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LD_DIRS)

my_target_libprofile_rt := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBPROFILE_RT)

my_target_libgcov := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCOV)

ifeq ($(LOCAL_NO_LIBGCC),true)

my_target_libgcc :=

else

my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)

endif

my_target_libatomic := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBATOMIC)

my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_SO_O)

my_target_crtend_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTEND_SO_O)