summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-02-16 10:38:53 -0800
committerAndre Eisenbach <eisenbach@google.com>2016-02-18 10:56:15 -0800
commit3122e5171ef26ff487f10826786606df848ca25e (patch)
tree06e534ce0aa5c3002d0a30928970358188163dd2 /Android.mk
parentcc810f757b28d95d3a67d1810426bbedd69a0d88 (diff)
downloadandroid_packages_apps_Bluetooth-3122e5171ef26ff487f10826786606df848ca25e.tar.gz
android_packages_apps_Bluetooth-3122e5171ef26ff487f10826786606df848ca25e.tar.bz2
android_packages_apps_Bluetooth-3122e5171ef26ff487f10826786606df848ca25e.zip
Add Java Protobuf dump and ScanEvent Protobuf
Add Protobuf dumping for the Java layer. Also add ScanEvent Protobuf to already existing scan event logging. Change-Id: Ib05973c8d98df3bead84b22b3773c42effb25c87
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 7b724d049..09cbaf42f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \
- $(call all-java-files-under, src)
+ $(call all-java-files-under, src) \
+ $(call all-proto-files-under, src)
LOCAL_PACKAGE_NAME := Bluetooth
LOCAL_CERTIFICATE := platform
@@ -23,6 +24,7 @@ LOCAL_CERTIFICATE := platform
LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni
LOCAL_JAVA_LIBRARIES := javax.obex telephony-common libprotobuf-java-micro
LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard bluetooth.mapsapi sap-api-java-static android-support-v4
+LOCAL_PROTOC_OPTIMIZE_TYPE := micro
LOCAL_REQUIRED_MODULES := bluetooth.default
LOCAL_MULTILIB := 32