diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 499a7aca59323..b339a2cd2eb02 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -4,6 +4,9 @@
 # Android Asset Packaging Tool
 #
 
+# This tool is prebuilt if we're doing an app-only build.
+ifeq ($(TARGET_BUILD_APPS),)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -53,3 +56,4 @@ LOCAL_MODULE := aapt
 
 include $(BUILD_HOST_EXECUTABLE)
 
+endif # TARGET_BUILD_APPS
diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk
index 944aeb60da914..2ad0728c22182 100644
--- a/tools/aidl/Android.mk
+++ b/tools/aidl/Android.mk
@@ -2,6 +2,9 @@
 #
 # Copies files into the directory structure described by a manifest
 
+# This tool is prebuilt if we're doing an app-only build.
+ifeq ($(TARGET_BUILD_APPS),)
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -21,4 +24,4 @@ LOCAL_MODULE := aidl
 
 include $(BUILD_HOST_EXECUTABLE)
 
-
+endif # TARGET_BUILD_APPS