Store symbols.zip in apps_only build. automerge: a60fb49
automerge: a73b611
* commit 'a73b611e6b2a626b144170f15509e02f3318976e':
Store symbols.zip in apps_only build.
diff --git a/core/Makefile b/core/Makefile
index 4ce0a54..25d9c19 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1511,10 +1511,14 @@
name := $(name)-symbols-$(FILE_NAME_TAG)
SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip
+# For apps_only build we'll establish the dependency later in build/core/main.mk.
+ifndef TARGET_BUILD_APPS
$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_BOOTIMAGE_TARGET)
+endif
+$(SYMBOLS_ZIP):
@echo "Package symbols: $@"
$(hide) rm -rf $@
- $(hide) mkdir -p $(dir $@)
+ $(hide) mkdir -p $(dir $@) $(TARGET_OUT_UNSTRIPPED)
$(hide) zip -qr $@ $(TARGET_OUT_UNSTRIPPED)
# -----------------------------------------------------------------
diff --git a/core/main.mk b/core/main.mk
index 7ca30c7..0a00950 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -931,6 +931,9 @@
$(PROGUARD_DICT_ZIP) : $(apps_only_installed_files)
$(call dist-for-goals,apps_only, $(PROGUARD_DICT_ZIP))
+ $(SYMBOLS_ZIP) : $(apps_only_installed_files)
+ $(call dist-for-goals,apps_only, $(SYMBOLS_ZIP))
+
.PHONY: apps_only
apps_only: $(unbundled_build_modules)