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

Commit 45ac4341 authored by Bruce Beare's avatar Bruce Beare
Browse files

Refactor Stripper. Allow a stripper other than SOSLIM to be specified 



Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: default avatarBruce Beare <brucex.j.beare@intel.com>
parent daea3fce

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ stnod: systemtarball-nodeps 
#######

## boot tarball

define build-boottarball-target

    $(hide) echo "Target boot fs tarball: $(INSTALLED_BOOTTARBALL_TARGET)

    $(hide) echo "Target boot fs tarball: $(INSTALLED_BOOTTARBALL_TARGET)"

    $(hide) mkdir -p $(PRODUCT_OUT)/boot

    $(hide) cp -f $(INTERNAL_BOOTIMAGE_FILES) $(PRODUCT_OUT)/boot/.

    $(hide) echo $(BOARD_KERNEL_CMDLINE) > $(PRODUCT_OUT)/boot/cmdline

core/combo/HOST_darwin-x86.mk

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error 
HOST_CC := $(CC)

HOST_CXX := $(CXX)

HOST_AR := $(AR)

HOST_STRIP := $(STRIP)

HOST_STRIP_COMMAND = $(HOST_STRIP) --strip-debug $< -o $@



HOST_SHLIB_SUFFIX := .dylib

HOST_JNILIB_SUFFIX := .jnilib

core/combo/TARGET_linux-arm.mk

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ TARGET_CXX := $(TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX) 
TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)

TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX)

TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX)

TARGET_STRIP := $(HOST_OUT_EXECUTABLES)/soslim$(HOST_EXECUTABLE_SUFFIX)

TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip --shady --quiet $< --outfile $@



TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined

core/combo/TARGET_linux-sh.mk

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ TARGET_CXX := $(TARGET_TOOLS_PREFIX)c++$(HOST_EXECUTABLE_SUFFIX) 
TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)

TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX)

TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX)

TARGET_STRIP := $(TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX)

TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-debug $< -o $@



TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
@@ -106,7 +108,7 @@ TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o 
TARGET_SOBEGIN := $(TARGET_OUT_STATIC_LIBRARIES)/sobegin.o

TARGET_SOEND := $(TARGET_OUT_STATIC_LIBRARIES)/soend.o



TARGET_STRIP_MODULE:=false

TARGET_STRIP_MODULE:=true



TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm

core/combo/TARGET_linux-x86.mk

+3 −1
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ TARGET_CXX := $(TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX) 
TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)

TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX)

TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX)

TARGET_STRIP := $(TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX)

TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-debug $< -o $@



ifneq ($(wildcard $(TARGET_CC)),)

TARGET_LIBGCC := \
@@ -97,7 +99,7 @@ TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o 
TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_so.o

TARGET_CRTEND_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_so.o



# TARGET_STRIP_MODULE:=true

TARGET_STRIP_MODULE:=true



TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm