diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-04-20 14:08:43 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-04-20 14:08:43 -0700 |
| commit | 594c0868d42b11e21d77dbdafa571d582b99305a (patch) | |
| tree | 046a1f2ecba2bd2f80cf3cf2bb51d12747c26d17 /core | |
| parent | 12753112f3e67c667c97078971d3538ef4fcdda7 (diff) | |
| parent | 6cb3732d82e6a2346c00219931d0f0a3c3257f44 (diff) | |
| download | build-594c0868d42b11e21d77dbdafa571d582b99305a.zip build-594c0868d42b11e21d77dbdafa571d582b99305a.tar.gz build-594c0868d42b11e21d77dbdafa571d582b99305a.tar.bz2 | |
resolved conflicts for merge of 6cb3732d to master
Change-Id: I6415638ccde1e78f74ae5d9527dc696d40f15e5f
Diffstat (limited to 'core')
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/config.mk | 3 | ||||
| -rw-r--r-- | core/dynamic_binary.mk | 29 | ||||
| -rw-r--r-- | core/product.mk | 1 |
4 files changed, 2 insertions, 32 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index fd117a5..6bdc113 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -93,7 +93,6 @@ LOCAL_COPY_HEADERS_TO:= LOCAL_COPY_HEADERS:= LOCAL_FORCE_STATIC_EXECUTABLE:= LOCAL_ADDITIONAL_DEPENDENCIES:= -LOCAL_COMPRESS_MODULE_SYMBOLS:= LOCAL_STRIP_MODULE:= LOCAL_JNI_SHARED_LIBRARIES:= LOCAL_JNI_SHARED_LIBRARIES_ABI:= diff --git a/core/config.mk b/core/config.mk index 3c8297d..289964d 100644 --- a/core/config.mk +++ b/core/config.mk @@ -132,9 +132,6 @@ COMMON_ANDROID_PACKAGE_SUFFIX := .apk # 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 -# TODO: do symbol compression -TARGET_COMPRESS_MODULE_SYMBOLS := false - ifdef TMPDIR JAVA_TMPDIR_ARG := -Djava.io.tmpdir=$(TMPDIR) else diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index cf06a3d..7a423db 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -39,30 +39,6 @@ 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 ########################################################### ifeq ($(LOCAL_UNSTRIPPED_PATH),) @@ -70,7 +46,7 @@ my_unstripped_path := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(m else my_unstripped_path := $(LOCAL_UNSTRIPPED_PATH) endif -symbolic_input := $(compress_output) +symbolic_input := $(linked_module) symbolic_output := $(my_unstripped_path)/$(my_installed_module_stem) $(symbolic_output) : $(symbolic_input) | $(ACP) @echo "target Symbolic: $(PRIVATE_MODULE) ($@)" @@ -134,5 +110,4 @@ endif # my_strip_module $(cleantarget): PRIVATE_CLEAN_FILES += \ $(linked_module) \ - $(symbolic_output) \ - $(compress_output) + $(symbolic_output) diff --git a/core/product.mk b/core/product.mk index b7e1aa9..4e8bff1 100644 --- a/core/product.mk +++ b/core/product.mk @@ -232,7 +232,6 @@ _product_stash_var_list := $(_product_var_list) \ TARGET_DEVICE_KERNEL_HEADERS \ TARGET_PRODUCT_KERNEL_HEADERS \ TARGET_BOOTLOADER_BOARD_NAME \ - TARGET_COMPRESS_MODULE_SYMBOLS \ TARGET_NO_BOOTLOADER \ TARGET_NO_KERNEL \ TARGET_NO_RECOVERY \ |