summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-03-13 17:26:27 (GMT)
committerSunny Goyal <sunnygoyal@google.com>2015-03-13 17:28:42 (GMT)
commitd68725cd20be0c1d5ebd583da5fde0f007a69bf8 (patch)
tree5e87575c00e1c7e0dfba34c638c11aa671933d3f /Android.mk
parent3739158bd7a41f6f8088c83de04c8bf48bc4d502 (diff)
downloadandroid_packages_apps_Trebuchet-d68725cd20be0c1d5ebd583da5fde0f007a69bf8.zip
android_packages_apps_Trebuchet-d68725cd20be0c1d5ebd583da5fde0f007a69bf8.tar.gz
android_packages_apps_Trebuchet-d68725cd20be0c1d5ebd583da5fde0f007a69bf8.tar.bz2
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
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 3853808..d7bfdd4 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))