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

Commit bd528a82 authored by Jeff Brown's avatar Jeff Brown Committed by Kenny Root
Browse files

Build system tweaks for Valgrind. 

Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.

Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused.  (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)

Change-Id: Ifed4ffe17003d90370c711ea6606e2b75e841dee
parent 86a90364

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ ifdef LOCAL_UNINSTALLABLE_MODULE 
    $(error $(LOCAL_PATH): Illegal use of LOCAL_UNINSTALLABLE_MODULE)

  endif

else

  LOCAL_INSTALLED_MODULE := $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE_SUBDIR)$(LOCAL_INSTALLED_MODULE_STEM)

  LOCAL_INSTALLED_MODULE := $(LOCAL_MODULE_PATH)/$(LOCAL_INSTALLED_MODULE_STEM)

endif



# Assemble the list of targets to create PRIVATE_ variables for.

core/binary.mk

+1 −0
Original line number Diff line number Diff line
@@ -540,6 +540,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEBUG_CFLAGS := $(debug_cflags) 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_C_INCLUDES := $(LOCAL_C_INCLUDES)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDFLAGS := $(LOCAL_LDFLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LDLIBS := $(LOCAL_LDLIBS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_CRT := $(LOCAL_NO_CRT)



# this is really the way to get the files onto the command line instead

# of using $^, because then LOCAL_ADDITIONAL_DEPENDENCIES doesn't work

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ LOCAL_BUILD_HOST_DEX:= 
LOCAL_DEX_PREOPT:=

LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full

LOCAL_PROTOC_FLAGS:=

LOCAL_NO_CRT:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

core/combo/TARGET_linux-arm.mk

+6 −6
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ $(TARGET_CXX) \ 
	-Wl,-shared,-Bsymbolic \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_ALL_OBJECTS) \

	$(PRIVATE_TARGET_CRTBEGIN_SO_O) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	-Wl,--whole-archive \

	$(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \

	-Wl,--no-whole-archive \
@@ -245,7 +245,7 @@ $(TARGET_CXX) \ 
	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_CRTEND_SO_O)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))

endef



define transform-o-to-executable-inner
@@ -257,14 +257,14 @@ $(TARGET_CXX) -nostdlib -Bdynamic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ 
	$(TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	$(TARGET_CRTBEGIN_DYNAMIC_O) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(PRIVATE_ALL_OBJECTS) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_FDO_LIB) \

	$(TARGET_LIBGCC) \

	$(TARGET_CRTEND_O)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

endef



define transform-o-to-static-executable-inner
@@ -272,12 +272,12 @@ $(TARGET_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ 
    -Wl,--gc-sections \

	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(TARGET_CRTBEGIN_STATIC_O) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_STATIC_O)) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(TARGET_FDO_LIB) \

	$(TARGET_LIBGCC) \

	$(TARGET_CRTEND_O)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

endef

core/combo/TARGET_linux-sh.mk

+7 −6
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ TARGET_C_INCLUDES := \ 
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o

TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o

TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o



TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/sobegin.o

TARGET_CRTEND_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/soend.o
@@ -119,7 +120,7 @@ $(TARGET_CXX) \ 
	-Wl,--gc-sections -Wl,-z,norelro \

	-Wl,-shared,-Bsymbolic \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_CRTBEGIN_SO_O) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

	$(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
@@ -130,7 +131,7 @@ $(TARGET_CXX) \ 
	$(PRIVATE_LDFLAGS) \

	$(subst -lrt,, $(subst -lpthread,,$(PRIVATE_LDLIBS))) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(PRIVATE_TARGET_CRTEND_SO_O)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))

endef



define transform-o-to-executable-inner
@@ -142,13 +143,13 @@ $(TARGET_CXX) -nostdlib -Bdynamic -Wl,-T,$(BUILD_SYSTEM)/shlelf.x \ 
	$(TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	$(TARGET_CRTBEGIN_DYNAMIC_O) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(PRIVATE_ALL_OBJECTS) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_LIBGCC) \

	$(subst -lrt,, $(subst -lpthread,,$(PRIVATE_LDLIBS))) \

	$(TARGET_CRTEND_O)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

endef



define transform-o-to-static-executable-inner
@@ -156,11 +157,11 @@ $(TARGET_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/shlelf.x \ 
	-Wl,--gc-sections -Wl,-z,norelro \

	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(TARGET_CRTBEGIN_STATIC_O) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_STATIC_O)) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(TARGET_LIBGCC) \

	$(subst -lrt,, $(subst -lpthread,,$(PRIVATE_LDLIBS))) \

	$(TARGET_CRTEND_O)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

endef