From 4b0f7dd2c0c4773606cb583f7f8b42b7bf092366 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 2 Feb 2015 10:33:05 -0800 Subject: [PATCH] Fix Android.mk. - You don't need to explicitly specify protobuf library; The library name has been changed and the build system automatically adds it. - You can't have a file target $(LOCAL_BUILT_MODULE) depend on phony target launcher_protoutil_lib. - "include $(call all-makefiles-under,$(LOCAL_PATH))" must be on the last line. (cherry picked from commit 3d74c6632ed6ab23db0cde80bc8a61daecfd49ef) Change-Id: I27d967a57d6a9373da50821af32191614a3c8bc7 --- Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 83d39d4ea4..41130af7f8 100644 --- a/Android.mk +++ b/Android.mk @@ -47,7 +47,6 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) -include $(call all-makefiles-under,$(LOCAL_PATH)) # # Protocol Buffer Debug Utility in Java @@ -78,10 +77,10 @@ LOCAL_MODULE := launcher_protoutil include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): launcher_protoutil_lib +$(LOCAL_BUILT_MODULE): | $(HOST_OUT_JAVA_LIBRARIES)/launcher_protoutil_lib.jar $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP) @echo "Copy: $(PRIVATE_MODULE) ($@)" $(copy-file-to-new-target) $(hide) chmod 755 $@ -INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) +include $(call all-makefiles-under,$(LOCAL_PATH))