summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2014-09-15 18:14:39 -0700
committerJeff Davidson <jpd@google.com>2015-02-02 10:39:11 -0800
commit123d99f0adc85e42fa5c34058719bf362aa20239 (patch)
treec523c9e7918819241f3584307c5362759648e952 /Android.mk
parentdc2e07493703b7f15c93ea5f383f9fa7fdcf20f1 (diff)
downloadandroid_packages_apps_Trebuchet-123d99f0adc85e42fa5c34058719bf362aa20239.tar.gz
android_packages_apps_Trebuchet-123d99f0adc85e42fa5c34058719bf362aa20239.tar.bz2
android_packages_apps_Trebuchet-123d99f0adc85e42fa5c34058719bf362aa20239.zip
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
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index cf2bb6132..83d39d4ea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,7 +64,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)