commit 4e888c5f31a8bd0bc1efcfe9656a756526940413
author Ying Wang <wangying@google.com> Thu Sep 20 12:48:22 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 20 12:48:22 2012 -0700
tree c7e75a4d39bb4189bf5e50f18d83947a319f642c
parent 98a93c73aeebe8dd774a7da80bcfb4ce0339a26b
parent 7fff9dd14d7c38cb1c499996d09d4e1b98e070ca

am 7fff9dd1: Use prebuilts for PDK build.

* commit '7fff9dd14d7c38cb1c499996d09d4e1b98e070ca':
  Use prebuilts for PDK build.

tools/Android.mk

diff --git a/tools/Android.mk b/tools/Android.mk
index 8db788b..6d47b3d 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -19,7 +19,6 @@
 ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
 
 ##################################
-ifneq ($(TARGET_BUILD_PDK),true)
 include $(CLEAR_VARS)
 
 # We can't simple call $(BUILD_PREBUILT) here, because $(ACP) is not
@@ -34,7 +33,6 @@
 	@echo "Copy: acp ($@)"
 	$(copy-file-to-target-with-cp)
 	$(hide) chmod 755 $@
-endif
 
 ##################################
 include $(CLEAR_VARS)
@@ -76,7 +74,6 @@
 include $(BUILD_PREBUILT)
 
 ##################################
-ifneq ($(TARGET_BUILD_PDK),true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := zipalign
@@ -101,7 +98,6 @@
 LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_PREBUILT)
-endif  # TARGET_BUILD_PDK not true
 
 ##################################
 include $(CLEAR_VARS)
@@ -136,4 +132,4 @@
 	$(hide) chmod 755 $@
 
 ##################################
-endif # TARGET_BUILD_APPS
+endif # TARGET_BUILD_APPS or TARGET_BUILD_PDK