openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove unsupported *_COMPRESS_MODULE_SYMBOLS"

This commit is contained in:
Dmitriy Ivanov 2015-04-20 20:18:55 +00:00 committed by Gerrit Code Review
parent 69b20474d5 4eb120b999
commit 5beb338793
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@ -92,7 +92,6 @@ LOCAL_COPY_HEADERS_TO:=
LOCAL_COPY_HEADERS:= LOCAL_COPY_HEADERS:=
LOCAL_FORCE_STATIC_EXECUTABLE:= LOCAL_FORCE_STATIC_EXECUTABLE:=
LOCAL_ADDITIONAL_DEPENDENCIES:= LOCAL_ADDITIONAL_DEPENDENCIES:=
LOCAL_COMPRESS_MODULE_SYMBOLS:=
LOCAL_STRIP_MODULE:= LOCAL_STRIP_MODULE:=
LOCAL_JNI_SHARED_LIBRARIES:= LOCAL_JNI_SHARED_LIBRARIES:=
LOCAL_JNI_SHARED_LIBRARIES_ABI:= LOCAL_JNI_SHARED_LIBRARIES_ABI:=

3
core/config.mk
View File

@ -131,9 +131,6 @@ COMMON_ANDROID_PACKAGE_SUFFIX := .apk
# list of flags to turn specific warnings in to errors # list of flags to turn specific warnings in to errors
TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point
# TODO: do symbol compression
TARGET_COMPRESS_MODULE_SYMBOLS := false
# ############################################################### # ###############################################################
# Include sub-configuration files # Include sub-configuration files
# ############################################################### # ###############################################################

29
core/dynamic_binary.mk
View File

@ -38,30 +38,6 @@ LOCAL_INTERMEDIATE_TARGETS := $(linked_module)
include $(BUILD_SYSTEM)/binary.mk include $(BUILD_SYSTEM)/binary.mk
################################### ###################################
###########################################################
## Compress
###########################################################
compress_input := $(linked_module)
ifeq ($(strip $(LOCAL_COMPRESS_MODULE_SYMBOLS)),)
LOCAL_COMPRESS_MODULE_SYMBOLS := $(strip $(TARGET_COMPRESS_MODULE_SYMBOLS))
endif
ifeq ($(LOCAL_COMPRESS_MODULE_SYMBOLS),true)
$(error Symbol compression not yet supported.)
compress_output := $(intermediates)/COMPRESSED-$(my_built_module_stem)
#TODO: write the real $(STRIPPER) rule.
#TODO: define a rule to build TARGET_SYMBOL_FILTER_FILE, and
# make it depend on ALL_ORIGINAL_DYNAMIC_BINARIES.
$(compress_output): $(compress_input) $(TARGET_SYMBOL_FILTER_FILE) | $(ACP)
@echo "target Compress Symbols: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target)
else
# Skip this step.
compress_output := $(compress_input)
endif
########################################################### ###########################################################
## Store a copy with symbols for symbolic debugging ## Store a copy with symbols for symbolic debugging
########################################################### ###########################################################
@ -70,7 +46,7 @@ my_unstripped_path := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(m
else else
my_unstripped_path := $(LOCAL_UNSTRIPPED_PATH) my_unstripped_path := $(LOCAL_UNSTRIPPED_PATH)
endif endif
symbolic_input := $(compress_output) symbolic_input := $(linked_module)
symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem) symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem)
$(symbolic_output) : $(symbolic_input) | $(ACP) $(symbolic_output) : $(symbolic_input) | $(ACP)
@echo "target Symbolic: $(PRIVATE_MODULE) ($@)" @echo "target Symbolic: $(PRIVATE_MODULE) ($@)"
@ -134,5 +110,4 @@ endif # my_strip_module
$(cleantarget): PRIVATE_CLEAN_FILES += \ $(cleantarget): PRIVATE_CLEAN_FILES += \
$(linked_module) \ $(linked_module) \
$(symbolic_output) \ $(symbolic_output)
$(compress_output)

1
core/product.mk
View File

@ -229,7 +229,6 @@ _product_stash_var_list := $(_product_var_list) \
TARGET_DEVICE_KERNEL_HEADERS \ TARGET_DEVICE_KERNEL_HEADERS \
TARGET_PRODUCT_KERNEL_HEADERS \ TARGET_PRODUCT_KERNEL_HEADERS \
TARGET_BOOTLOADER_BOARD_NAME \ TARGET_BOOTLOADER_BOARD_NAME \
TARGET_COMPRESS_MODULE_SYMBOLS \
TARGET_NO_BOOTLOADER \ TARGET_NO_BOOTLOADER \
TARGET_NO_KERNEL \ TARGET_NO_KERNEL \
TARGET_NO_RECOVERY \ TARGET_NO_RECOVERY \