diff options
author | Ying Wang <wangying@google.com> | 2015-02-02 10:33:05 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 21:11:45 -0700 |
commit | 6f17b3529b51f5a5c0d40b620550e26f45e32f53 (patch) | |
tree | 95455cdf03611794094259215fdd70e8380f6594 | |
parent | 3100d7bac56fbe9adfa2d84f701d05f6f8d97c6e (diff) | |
download | android_packages_apps_Trebuchet-6f17b3529b51f5a5c0d40b620550e26f45e32f53.tar.gz android_packages_apps_Trebuchet-6f17b3529b51f5a5c0d40b620550e26f45e32f53.tar.bz2 android_packages_apps_Trebuchet-6f17b3529b51f5a5c0d40b620550e26f45e32f53.zip |
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
-rw-r--r-- | Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index e4ea7ecff..af967ac5a 100644 --- a/Android.mk +++ b/Android.mk @@ -53,7 +53,6 @@ LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE) -include $(call all-makefiles-under,$(LOCAL_PATH)) # # Protocol Buffer Debug Utility in Java @@ -84,10 +83,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)) |