diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-03-13 10:26:27 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-03-16 17:57:33 +0000 |
| commit | ef30a2a8312b83985a8ad3eb8feebbb944cbae01 (patch) | |
| tree | 26906e570168021347becf32b5b93a6ee187d585 /Android.mk | |
| parent | fe1dcbf0c5a1767e077a051ef5f7b72540d55f62 (diff) | |
| download | android_packages_apps_Trebuchet-ef30a2a8312b83985a8ad3eb8feebbb944cbae01.tar.gz android_packages_apps_Trebuchet-ef30a2a8312b83985a8ad3eb8feebbb944cbae01.tar.bz2 android_packages_apps_Trebuchet-ef30a2a8312b83985a8ad3eb8feebbb944cbae01.zip | |
[DO NOT MERGE] 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
(cherry picked from commit d68725cd20be0c1d5ebd583da5fde0f007a69bf8)
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 110117be4..340caca0b 100644 --- a/Android.mk +++ b/Android.mk @@ -47,8 +47,6 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) -include $(call all-makefiles-under,$(LOCAL_PATH)) - # # Protocol Buffer Debug Utility in Java # @@ -86,3 +84,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)) |