commit 62925a993a60a4d5754f012612eaa7b35d76672a
author Ying Wang <wangying@google.com> Wed Apr 08 16:37:34 2015 -0700
committer Ying Wang <wangying@google.com> Wed Apr 08 16:37:34 2015 -0700
tree a6a71af5e3fce6e209a10428c1d67a8b2515b8be
parent f5b9830bc94d1416001fda508c7ecf16db5db27c

Remove unnecessary confusing use of $(intermediate).

Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 5b26958..81f80fd 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1280,10 +1280,7 @@
 otatools: $(OTATOOLS)
 
 BUILT_OTATOOLS_PACKAGE := $(PRODUCT_OUT)/otatools.zip
-$(BUILT_OTATOOLS_PACKAGE): \
-	intermediate := $(call intermediates-dir-for,PACKAGING,otatools)
-$(BUILT_OTATOOLS_PACKAGE): \
-	zip_root := $(intermediate)/otatools
+$(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,otatools)/otatools
 
 $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP)
 	@echo "Package OTA tools: $@"