commit 9560d31716319be62c97d929f6172c84e267a673
author Yabin Cui <yabinc@google.com> Tue Jan 27 22:59:46 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 27 22:59:46 2015 +0000
tree 9f948316ed15a7f62dff40ff547d473c02cb9eeb
parent 1bc2c6af5b73d6d448452b8bcb75222fbc81a532
parent 0d1f0f8e5af89348c7c43b744dbe50433810ed0f

Merge "Kill HAVE_PTHREADS."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 49f48fc..6bafdb9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1719,7 +1719,7 @@
 MAIN_SDK_NAME := $(sdk_name)
 MAIN_SDK_DIR  := $(sdk_dir)
 MAIN_SDK_ZIP  := $(INTERNAL_SDK_TARGET)
-ifneq ($(filter win_sdk,$(MAKECMDGOALS)),)
+ifneq ($(filter win_sdk winsdk-tools,$(MAKECMDGOALS)),)
 include $(TOPDIR)development/build/tools/windows_sdk.mk
 endif
 

core/pathmap.mk

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 60ee815..2532707 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -27,7 +27,6 @@
 # A mapping from shorthand names to include directories.
 #
 pathmap_INCL := \
-    bootloader:bootable/bootloader/legacy/include \
     camera:system/media/camera/include \
     frameworks-base:frameworks/base/include \
     frameworks-native:frameworks/native/include \