From 62925a993a60a4d5754f012612eaa7b35d76672a Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Wed, 8 Apr 2015 16:37:34 -0700
Subject: [PATCH] Remove unnecessary confusing use of $(intermediate).

Change-Id: I0e73c3c1bf94540419e1fd227a3096da148e2459
---
 core/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 5b269582b..81f80fd18 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1280,10 +1280,7 @@ OTATOOLS := $(DISTTOOLS) \
 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: $@"
-- 
2.11.0