commit 94539b152e700da1a4c56a47ed8082a51a2855a7
author Ying Wang <wangying@google.com> Sat Jun 02 09:28:34 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 02 09:28:34 2012 -0700
tree f0e30dc722527e3854d0c3fab70b19064285fe3c
parent 692e7904ce36591c1ec05268ca6d51e2c240f47b
parent 0fb728b65ab2199e0273af1217711aa46d6504c6

am 0fb728b6: am 28a18175: Don\'t use .. to reference the target file.

* commit '0fb728b65ab2199e0273af1217711aa46d6504c6':
  Don't use .. to reference the target file.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index b88399e..78b9f1e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -831,7 +831,7 @@
 		$(TARGET_COPY_OUT_SYSTEM) \
 		$(patsubst $(PRODUCT_OUT)/%, %, $(TARGET_OUT_NOTICE_FILES))
 ifeq (true,$(PLATFORM_ZIP_ADD_JAVA))
-	$(hide) cd $(OUT_DIR) && zip -qry ../$(INSTALLED_PLATFORM_ZIP) $(PDK_PLATFORM_JAVA_ZIP_CONTENTS)
+	$(hide) cd $(OUT_DIR) && zip -qry $(patsubst $(OUT_DIR)/%,%,$@) $(PDK_PLATFORM_JAVA_ZIP_CONTENTS)
 endif