commit 7859c8c4a89793fa31206d90ec699edef947b376
author Ying Wang <wangying@google.com> Fri Oct 24 11:36:59 2014 -0700
committer The Android Automerger <android-build@google.com> Wed Oct 29 13:29:41 2014 -0700
tree 8c838db8d24d8aeac94f8fecddccf3ebd8691590
parent 4a9dff64eedca6108a35d68dcf5daab1749604be

Store symbols.zip in apps_only build.

Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 2177a18..b08ad1b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1510,10 +1510,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)
 
 # -----------------------------------------------------------------

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 749929a..9d6e233 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -936,6 +936,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)