From d68725cd20be0c1d5ebd583da5fde0f007a69bf8 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 13 Mar 2015 10:26:27 -0700
Subject: 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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 385380861..d7bfdd464 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,8 +50,6 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
 #
 # Protocol Buffer Debug Utility in Java
 #
@@ -89,3 +87,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)
 	$(hide) chmod 755 $@
 
 INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+
+# ==================================================
+include $(call all-makefiles-under,$(LOCAL_PATH))
-- 
cgit v1.2.3