commit d68725cd20be0c1d5ebd583da5fde0f007a69bf8
author Sunny Goyal <sunnygoyal@google.com> Fri Mar 13 10:26:27 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Fri Mar 13 10:28:42 2015 -0700
tree 5e87575c00e1c7e0dfba34c638c11aa671933d3f
parent 3739158bd7a41f6f8088c83de04c8bf48bc4d502

Fixing build error in launcher_protoutil_lib

> Since test build rules were included before the launcher_protoutil_lib
rule, all the following paths got prefixed with "tests/" giving file
not found error

Change-Id: I13f96fc2f14336b0ff40f086176cc4afbc254791

Android.mk

diff --git a/Android.mk b/Android.mk
index 3853808..d7bfdd4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,8 +50,6 @@
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
 #
 # Protocol Buffer Debug Utility in Java
 #
@@ -89,3 +87,6 @@
 	$(hide) chmod 755 $@
 
 INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+
+# ==================================================
+include $(call all-makefiles-under,$(LOCAL_PATH))