summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2014-09-16 01:14:39 (GMT)
committerDanesh M <daneshm90@gmail.com>2015-09-28 04:11:41 (GMT)
commit3100d7bac56fbe9adfa2d84f701d05f6f8d97c6e (patch)
treede8533b66aa0925d8157d27df2d6bb2fc294080f
parent357bd888575301e0c79adcfce89018a85b621e8e (diff)
downloadandroid_packages_apps_Trebuchet-3100d7bac56fbe9adfa2d84f701d05f6f8d97c6e.zip
android_packages_apps_Trebuchet-3100d7bac56fbe9adfa2d84f701d05f6f8d97c6e.tar.gz
android_packages_apps_Trebuchet-3100d7bac56fbe9adfa2d84f701d05f6f8d97c6e.tar.bz2
Update protobuf library from 2.3 to 2.6.
The dependency here can be removed because it it automatically added when LOCAL_PROTOC_OPTIMIZE_TYPE=nano by build/core/host_java_library_common.mk. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
-rw-r--r--Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index fda9f51..e4ea7ec 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,7 +70,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-nano
include $(BUILD_HOST_JAVA_LIBRARY)