summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-02-02 18:33:05 (GMT)
committerYing Wang <wangying@google.com>2015-02-02 18:34:00 (GMT)
commit3d74c6632ed6ab23db0cde80bc8a61daecfd49ef (patch)
treec7ff7828d5e23794bb83c8be0e82c1129ccf33df /Android.mk
parenta2306fce10443326951fa95f02f87c1df21c6239 (diff)
downloadandroid_packages_apps_Trebuchet-3d74c6632ed6ab23db0cde80bc8a61daecfd49ef.zip
android_packages_apps_Trebuchet-3d74c6632ed6ab23db0cde80bc8a61daecfd49ef.tar.gz
android_packages_apps_Trebuchet-3d74c6632ed6ab23db0cde80bc8a61daecfd49ef.tar.bz2
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. Change-Id: I0d7d7df555f53b5ee5ff2bc5fe2b9e58dbe8a9d5
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 110117b..41130af 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
@@ -64,7 +63,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := launcher_protoutil_lib
LOCAL_IS_HOST_MODULE := true
LOCAL_JAR_MANIFEST := util/etc/manifest.txt
-LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-2.3.0-nano
include $(BUILD_HOST_JAVA_LIBRARY)
@@ -79,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))