commit dfafee3b782cc48562126b9c4748cfa2f49f3158
author Ying Wang <wangying@google.com> Tue Jun 03 01:25:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 03 01:25:23 2014 +0000
tree d5d33f008ccfb77fb7dda574d898e518aadb9693
parent 362d2d4123a755a3e39a2015cf49da7db24a26ad
parent 7f349dc968a3fc76f48e1e199f1036b40e582851

am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"

* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
  Move sdk staging dir to a product-specific dir

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index ca95326..777c0f3 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1456,7 +1456,7 @@
 # The SDK
 
 # The SDK includes host-specific components, so it belongs under HOST_OUT.
-sdk_dir := $(HOST_OUT)/sdk
+sdk_dir := $(HOST_OUT)/sdk/$(TARGET_PRODUCT)
 
 # Build a name that looks like:
 #