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

Commit 78104cdd authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topics "make_strip_sh", "soong_cc_prebuilt" 

* changes:
  Use build/soong/scripts/strip.sh for Make modules
  Add soong_cc_prebuilt.mk
parents d72c37eb 830eed81

core/base_rules.mk

+5 −0
Original line number Diff line number Diff line
@@ -328,7 +328,11 @@ LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE) 
# As .KATI_RESTAT is specified to .toc files and commit-change-for-toc is used,

# dependent binaries of a .toc file will be rebuilt only when the content of

# the .toc file is changed.

#

# Don't create .toc files for Soong shared libraries, that is handled in

# Soong and soong_cc_prebuilt.mk

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

ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE).toc

$(LOCAL_BUILT_MODULE).toc: $(LOCAL_BUILT_MODULE)
@@ -345,6 +349,7 @@ $(eval $(call copy-one-file,$(LOCAL_BUILT_MODULE).toc,$(OVERRIDE_BUILT_MODULE_PA 
$(OVERRIDE_BUILT_MODULE_PATH)/$(my_built_module_stem).toc: $(OVERRIDE_BUILT_MODULE_PATH)/$(my_built_module_stem)

endif

endif

endif



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

## logtags: Add .logtags files to global list

core/binary.mk

+29 −52
Original line number Diff line number Diff line
@@ -372,10 +372,7 @@ my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_V 
my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)

my_header_libraries := $(LOCAL_HEADER_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_HEADER_LIBRARIES_$(my_32_64_bit_suffix)) $(my_header_libraries)



# soong defined modules already have done through this

ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

include $(BUILD_SYSTEM)/cxx_stl_setup.mk

endif



# Add static HAL libraries

ifdef LOCAL_HAL_STATIC_LIBRARIES
@@ -392,8 +389,6 @@ else 
  my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)LINKER)

endif



# Modules from soong do not need this since the dependencies are already handled there.

ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

include $(BUILD_SYSTEM)/config_sanitizers.mk



ifneq ($(LOCAL_NO_LIBCOMPILER_RT),true)
@@ -407,7 +402,6 @@ endif 
ifeq ($($(my_prefix)OS),windows)

  my_static_libraries += libwinpthread

endif

endif # this module is not from soong



ifneq ($(filter ../%,$(my_src_files)),)

my_soong_problems += dotdot_srcs
@@ -1270,9 +1264,6 @@ ifneq ($(LOCAL_USE_VNDK),) 
  ## switch all soong libraries over to the /vendor

  ## variant.

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

  ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

    # We don't do this renaming for soong-defined modules since they already have correct

    # names (with .vendor suffix when necessary) in their LOCAL_*_LIBRARIES.

  my_whole_static_libraries := $(foreach l,$(my_whole_static_libraries),\

    $(if $(SPLIT_VENDOR.STATIC_LIBRARIES.$(l)),$(l).vendor,$(l)))

  my_static_libraries := $(foreach l,$(my_static_libraries),\
@@ -1284,16 +1275,13 @@ ifneq ($(LOCAL_USE_VNDK),) 
  my_header_libraries := $(foreach l,$(my_header_libraries),\

    $(if $(SPLIT_VENDOR.HEADER_LIBRARIES.$(l)),$(l).vendor,$(l)))

endif

endif



# Platform can use vendor public libraries. If a required shared lib is one of

# the vendor public libraries, the lib is switched to the stub version of the lib.

ifeq ($(LOCAL_USE_VNDK),)

  ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

  my_shared_libraries := $(foreach l,$(my_shared_libraries),\

    $(if $(filter $(l),$(VENDOR_PUBLIC_LIBRARIES)),$(l).vendorpublic,$(l)))

endif

endif



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

## Set up installed module dependency
@@ -1613,8 +1601,6 @@ ifeq ($(my_strict),true) 
endif



# Check if -Werror or -Wno-error is used in C compiler flags.

# Modules defined in $(SOONG_ANDROID_MK) are checked in soong's cc.go.

ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

# Header libraries do not need cflags.

ifneq (HEADER_LIBRARIES,$(LOCAL_MODULE_CLASS))

  # Prebuilt modules do not need cflags.
@@ -1637,7 +1623,6 @@ ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) 
    endif

  endif

endif

endif



# Disable clang-tidy if it is not found.

ifeq ($(PATH_TO_CLANG_TIDY),)
@@ -1764,12 +1749,6 @@ all_libraries := \ 
###########################################################

export_includes := $(intermediates)/export_includes

export_cflags := $(foreach d,$(my_export_c_include_dirs),-I $(d))

# Soong exports cflags instead of include dirs, so that -isystem can be included.

ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

export_cflags += $(LOCAL_EXPORT_CFLAGS)

else ifdef LOCAL_EXPORT_CFLAGS

$(call pretty-error,LOCAL_EXPORT_CFLAGS can only be used by Soong, use LOCAL_EXPORT_C_INCLUDE_DIRS instead)

endif

$(export_includes): PRIVATE_EXPORT_CFLAGS := $(export_cflags)

# Headers exported by whole static libraries are also exported by this library.

export_include_deps := $(strip \
@@ -1814,7 +1793,6 @@ export_cflags := 
# Make sure export_includes gets generated when you are running mm/mmm

$(LOCAL_BUILT_MODULE) : | $(export_includes)



ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

ifneq (,$(filter-out $(LOCAL_PATH)/%,$(my_export_c_include_dirs)))

my_soong_problems += non_local__export_c_include_dirs

endif
@@ -1830,7 +1808,6 @@ SOONG_CONV.$(LOCAL_MODULE).DEPS := \ 
        $(my_system_shared_libraries))

SOONG_CONV.$(LOCAL_MODULE).TYPE := native

SOONG_CONV := $(SOONG_CONV) $(LOCAL_MODULE)

endif



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

# Coverage packaging.

core/clear_vars.mk

+8 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
###########################################################



# '',true

LOCAL_2ND_ARCH_VAR_PREFIX:=

LOCAL_32_BIT_ONLY:=

LOCAL_AAPT2_ONLY:=

LOCAL_AAPT_FLAGS:=
@@ -66,13 +67,16 @@ LOCAL_DONT_DELETE_JAR_META_INF:= 
LOCAL_DONT_MERGE_MANIFESTS:=

LOCAL_DPI_FILE_STEM:=

LOCAL_DPI_VARIANTS:=

LOCAL_DROIDDOC_ANNOTATIONS_ZIP :=

LOCAL_DROIDDOC_ASSET_DIR:=

LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=

LOCAL_DROIDDOC_DOC_ZIP :=

LOCAL_DROIDDOC_HTML_DIR:=

LOCAL_DROIDDOC_OPTIONS:=

LOCAL_DROIDDOC_SOURCE_PATH:=

LOCAL_DROIDDOC_STUB_OUT_DIR:=

LOCAL_DROIDDOC_STUBS_SRCJAR :=

LOCAL_DROIDDOC_TEMPLATE_DIR:=

LOCAL_DROIDDOC_USE_STANDARD_DOCLET:=

LOCAL_DX_FLAGS:=
@@ -107,6 +111,7 @@ LOCAL_GROUP_STATIC_LIBRARIES:= 
LOCAL_GTEST:=true

LOCAL_HAL_STATIC_LIBRARIES:=

LOCAL_HEADER_LIBRARIES:=

LOCAL_HOST_PREFIX:=

LOCAL_HOST_REQUIRED_MODULES:=

LOCAL_INIT_RC:=

LOCAL_INSTALLED_MODULE:=
@@ -252,13 +257,13 @@ LOCAL_SOONG_DEX_JAR := 
LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=

LOCAL_SOONG_HEADER_JAR :=

LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=

LOCAL_SOONG_LINK_TYPE :=

LOCAL_SOONG_PROGUARD_DICT :=

LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=

LOCAL_SOONG_RRO_DIRS :=

LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=

LOCAL_DROIDDOC_STUBS_SRCJAR :=

LOCAL_DROIDDOC_DOC_ZIP :=

LOCAL_DROIDDOC_ANNOTATIONS_ZIP :=

LOCAL_SOONG_TOC :=

LOCAL_SOONG_UNSTRIPPED_BINARY :=

# '',true

LOCAL_SOURCE_FILES_ALL_GENERATED:=

LOCAL_SRC_FILES:=

core/config.mk

+0 −1
Original line number Diff line number Diff line
@@ -651,7 +651,6 @@ SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper 
SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip

MERGE_ZIPS := $(SOONG_HOST_OUT_EXECUTABLES)/merge_zips

XMLLINT := $(SOONG_HOST_OUT_EXECUTABLES)/xmllint

XZ := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin/xz

ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip

ZIPTIME := $(prebuilt_build_tools_bin)/ziptime

core/definitions.mk

+0 −48
Original line number Diff line number Diff line
@@ -1834,54 +1834,6 @@ define transform-o-to-shared-lib 
$(transform-o-to-shared-lib-inner)

endef



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

## Commands for filtering a target executable or library

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



ifneq ($(TARGET_BUILD_VARIANT),user)

  TARGET_STRIP_EXTRA = && $(PRIVATE_OBJCOPY_ADD_SECTION) --add-gnu-debuglink=$< $@

  TARGET_STRIP_KEEP_SYMBOLS_EXTRA = --add-gnu-debuglink=$<

endif



define transform-to-stripped

@echo "$($(PRIVATE_PREFIX)DISPLAY) Strip: $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_STRIP) $(PRIVATE_STRIP_ALL_FLAGS) $< \

  $(PRIVATE_STRIP_O_FLAG) $@ \

  $(if $(PRIVATE_NO_DEBUGLINK),,$(TARGET_STRIP_EXTRA))

endef



define transform-to-stripped-keep-mini-debug-info

@echo "$($(PRIVATE_PREFIX)DISPLAY) Strip (mini debug info): $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(hide) rm -f $@ $@.dynsyms $@.funcsyms $@.keep_symbols $@.debug $@.mini_debuginfo.xz

if $(PRIVATE_STRIP) $(PRIVATE_STRIP_ALL_FLAGS) \

  --remove-section .comment $< \

  $(PRIVATE_STRIP_O_FLAG) $@; then  \

  $(PRIVATE_OBJCOPY) --only-keep-debug $< $@.debug && \

  $(PRIVATE_NM) -D $< --format=posix --defined-only | awk '{ print $$1 }' | sort >$@.dynsyms && \

  $(PRIVATE_NM) $< --format=posix --defined-only | awk '{ if ($$2 == "T" || $$2 == "t" || $$2 == "D") print $$1 }' | sort >$@.funcsyms && \

  comm -13 $@.dynsyms $@.funcsyms >$@.keep_symbols && \

  echo >>$@.keep_symbols && \

  $(PRIVATE_OBJCOPY) --rename-section .debug_frame=saved_debug_frame $@.debug $@.mini_debuginfo && \

  $(PRIVATE_OBJCOPY) -S --remove-section .gdb_index --remove-section .comment --keep-symbols=$@.keep_symbols $@.mini_debuginfo && \

  $(PRIVATE_OBJCOPY) --rename-section saved_debug_frame=.debug_frame $@.mini_debuginfo && \

  rm -f $@.mini_debuginfo.xz && \

  $(XZ) $@.mini_debuginfo && \

  $(PRIVATE_OBJCOPY_ADD_SECTION) --add-section .gnu_debugdata=$@.mini_debuginfo.xz $@; \

else \

  cp -f $< $@; \

fi

endef



define transform-to-stripped-keep-symbols

@echo "$($(PRIVATE_PREFIX)DISPLAY) Strip (keep symbols): $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_OBJCOPY_ADD_SECTION) \

    `$(PRIVATE_READELF) -S $< | awk '/.debug_/ {print "--remove-section " $$2}' | xargs` \

    $(TARGET_STRIP_KEEP_SYMBOLS_EXTRA) $< $@

endef



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

## Commands for running gcc to link an executable

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