commit 453dd41d6f3c3dd1303f6faf2a9340c4e9816d50
author Sunny Goyal <sunnygoyal@google.com> Fri Mar 13 18:16:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 13 18:16:26 2015 +0000
tree b1dcbdad97fc3d634a6423bf2259d00270bf88eb
parent 3c9653ea9e372ada9bc284263627c9b3eff7b673
parent d68725cd20be0c1d5ebd583da5fde0f007a69bf8

am d68725cd: Fixing build error in launcher_protoutil_lib

* commit 'd68725cd20be0c1d5ebd583da5fde0f007a69bf8':
  Fixing build error in launcher_protoutil_lib

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))