commit 320b94d030032228df769e513931a262f8637738
author Keun young Park <keunyoung@google.com> Thu Sep 20 13:50:02 2012 -0700
committer The Android Automerger <android-build@android.com> Thu Sep 20 17:47:12 2012 -0700
tree c62a36e4b5640e747a4245e220e962c58f369687
parent cb99c224763efce5c1e472bcfb9465c3f68fa533

fix PDK build

- build tools not coming from prebuilts for PDK

Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f

tools/Android.mk

diff --git a/tools/Android.mk b/tools/Android.mk
index a29cd3d..f646c37 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -14,7 +14,15 @@
 # limitations under the License.
 #
 
-ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
+ifeq (,$(TARGET_BUILD_APPS))
+
 LOCAL_PATH := $(call my-dir)
-include $(call first-makefiles-under,$(LOCAL_PATH))
+
+ifeq ($(TARGET_BUILD_PDK),true)
+include $(filter-out %/acp/Android.mk %/signapk/Android.mk %/zipalign/Android.mk,\
+  $(call all-makefiles-under,$(LOCAL_PATH)))
+else # !PDK
+include $(call all-makefiles-under,$(LOCAL_PATH))
+endif # PDK
+
 endif