From 722266918f5b1152bab0a9c05790420d09229b29 Mon Sep 17 00:00:00 2001 From: Keun young Park Date: Tue, 31 Jul 2012 17:13:20 -0700 Subject: [PATCH] add symbol files to PDK release for debugging - app_process is not in PDK, and this makes native debugging difficult So provide symbol file instead of source Bug: 6774048 Change-Id: I1a3a86cf64d8f1d22cdb3a22714f508de963099b --- core/Makefile | 3 ++- core/pdk_config.mk | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index a6974a39e..1a3627741 100644 --- a/core/Makefile +++ b/core/Makefile @@ -829,7 +829,8 @@ $(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEMIMAGE_FILES) $(hide) rm -f $@ $(hide) cd $(dir $@) && zip -qry $(notdir $@) \ $(TARGET_COPY_OUT_SYSTEM) \ - $(patsubst $(PRODUCT_OUT)/%, %, $(TARGET_OUT_NOTICE_FILES)) + $(patsubst $(PRODUCT_OUT)/%, %, $(TARGET_OUT_NOTICE_FILES)) \ + $(addprefix symbols/,$(PDK_SYMBOL_FILES_LIST)) ifeq (true,$(PLATFORM_ZIP_ADD_JAVA)) $(hide) cd $(OUT_DIR) && zip -qry $(patsubst $(OUT_DIR)/%,%,$@) $(PDK_PLATFORM_JAVA_ZIP_CONTENTS) endif diff --git a/core/pdk_config.mk b/core/pdk_config.mk index ddf240c94..77e913332 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -153,3 +153,16 @@ $(info PDK Build uses the current platform API) endif # PDK_JAVA endif # BUILD_PDK + +ifneq (,$(filter platform platform-java, $(MAKECMDGOALS))$(filter true,$(TARGET_BUILD_PDK))) +# files under $(PRODUCT_OUT)/symbols to help debugging. +# Source not included to PDK due to dependency issue, so provide symbols instead. +PDK_SYMBOL_FILES_LIST := \ + system/bin/app_process + +ifdef PDK_FUSION_PLATFORM_ZIP +# symbols should be explicitly pulled for fusion build +$(foreach f,$(PDK_SYMBOL_FILES_LIST),\ + $(eval $(call add-dependency,$(PRODUCT_OUT)/$(f),$(PRODUCT_OUT)/symbols/$(f)))) +endif # PLATFORM_ZIP +endif # platform.zip build or PDK -- 2.11.0