From 7fcb077c5522c56e266947e073c8750019e5a98a Mon Sep 17 00:00:00 2001
From: Jamie Gennis <jgennis@google.com>
Date: Tue, 26 Apr 2011 17:26:37 -0700
Subject: [PATCH] libgui: enable tests in the 'tests' build.

This change makes the libgui makefile recurse into the tests directory
so that the tests get built by a top-level make when
TARGET_BUILD_VARIANT=tests.

Change-Id: I6f623cc4b86dfeb00b9d21823316dbd9def23110
---
 libs/gui/Android.mk       | 4 ++++
 libs/gui/tests/Android.mk | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 58bb0d31f..b5737ffff 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -38,3 +38,7 @@ ifeq ($(TARGET_SIMULATOR),true)
 endif
 
 include $(BUILD_SHARED_LIBRARY)
+
+ifeq (,$(ONE_SHOT_MAKEFILE))
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif
diff --git a/libs/gui/tests/Android.mk b/libs/gui/tests/Android.mk
index ecd099511..8d3a9b5eb 100644
--- a/libs/gui/tests/Android.mk
+++ b/libs/gui/tests/Android.mk
@@ -36,9 +36,6 @@ LOCAL_C_INCLUDES := \
 
 include $(BUILD_EXECUTABLE)
 
-# Build the manual test programs.
-include $(call all-subdir-makefiles)
-
 endif
 
 # Include subdirectory makefiles