Add both app_process[32|64] to PDK_SYMBOL_FILES_LIST
We may not be building all of them.
The platform.zip just silently ignores the nonexistent ones.
Also grep out the existing one when eastablishing the dependency in
fusion build.
Actually PDK_SYMBOL_FILES_LIST is used in 2 cases:
1) to build the symbol files into the platform.zip.
2) to establish the dependency on the symbol files
when doing fusion build.
The previous fix only considered case 2).
Bug: 14997273
Change-Id: I028a5b6c3a3b001efac33d3f56bd2a84f532e5b3
diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index d1e86f1..51f2e17 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -193,20 +193,15 @@
# files under $(PRODUCT_OUT)/symbols to help debugging.
# Source not included to PDK due to dependency issue, so provide symbols instead.
-# find the real path of app_process, not the symlink
-_all_app_process := $(filter system/bin/app_process%, $(_pdk_fusion_file_list))
-ifneq (1,$(words $(_all_app_process)))
-_all_app_process := $(filter-out system/bin/app_process, $(_all_app_process))
-endif
-
+# We may not be building all of them.
+# The platform.zip just silently ignores the nonexistent ones.
PDK_SYMBOL_FILES_LIST := \
- $(_all_app_process)
-
-_all_app_process :=
+ system/bin/app_process32 \
+ system/bin/app_process64
ifdef PDK_FUSION_PLATFORM_ZIP
# symbols should be explicitly pulled for fusion build
-$(foreach f,$(PDK_SYMBOL_FILES_LIST),\
+$(foreach f,$(filter $(PDK_SYMBOL_FILES_LIST), $(_pdk_fusion_file_list)),\
$(eval $(call add-dependency,$(PRODUCT_OUT)/$(f),$(PRODUCT_OUT)/symbols/$(f))))
endif # PLATFORM_ZIP
endif # platform.zip build or PDK