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
This commit is contained in:
Ying Wang 2014-06-03 01:25:23 +00:00 committed by Android Git Automerger
commit dfafee3b78

View file

@ -1456,7 +1456,7 @@ endif
# 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:
#