diff --git a/services/input/tests/Android.mk b/services/input/tests/Android.mk
index 3eb93dc..68093ec 100644
--- a/services/input/tests/Android.mk
+++ b/services/input/tests/Android.mk
@@ -1,39 +1,42 @@
-# Build the unit tests.
+#
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
-# Build the unit tests.
-test_src_files := \
-    InputReader_test.cpp \
-    InputDispatcher_test.cpp
-
-shared_libraries := \
-    libcutils \
+INPUT_SERVICE_TEST_SHARED_LIBRARIES := \
     liblog \
-    libandroidfw \
     libutils \
-    libhardware \
-    libhardware_legacy \
-    libui \
-    libskia \
     libinput \
-    libinputservice
+    libskia \
+    libinputservice \
 
-c_includes := \
-    external/skia/include/core
+include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_MODULE := InputReader_test
+LOCAL_MODULE_TAGS := eng tests
+LOCAL_C_INCLUDES := external/skia/include/core
+LOCAL_SRC_FILES := InputReader_test.cpp
+LOCAL_SHARED_LIBRARIES := $(INPUT_SERVICE_TEST_SHARED_LIBRARIES)
+include $(BUILD_NATIVE_TEST)
 
-module_tags := eng tests
-
-$(foreach file,$(test_src_files), \
-    $(eval include $(CLEAR_VARS)) \
-    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
-    $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
-    $(eval LOCAL_C_INCLUDES := $(c_includes)) \
-    $(eval LOCAL_SRC_FILES := $(file)) \
-    $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
-    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \
-    $(eval include $(BUILD_NATIVE_TEST)) \
-)
-
-# Build the manual test programs.
-include $(call all-makefiles-under, $(LOCAL_PATH))
+include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_MODULE := InputDispatcher_test
+LOCAL_MODULE_TAGS := eng tests
+LOCAL_C_INCLUDES := external/skia/include/core
+LOCAL_SRC_FILES := InputDispatcher_test.cpp
+LOCAL_SHARED_LIBRARIES := $(INPUT_SERVICE_TEST_SHARED_LIBRARIES)
+include $(BUILD_NATIVE_TEST)