Update to use LOCAL_STATIC_ANDROID_LIBRARIES

Test: builds
Change-Id: Icec8b7f5606ac85dba64793a131815701525e3a6

diff --git a/Android.mk b/Android.mk
index 2f58be0..97390fd 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -19,10 +19,13 @@ LOCAL_SRC_FILES := \
 
 LOCAL_PACKAGE_NAME := Bluetooth
 LOCAL_CERTIFICATE := platform
+LOCAL_USE_AAPT2 := true
 
 LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni
 LOCAL_JAVA_LIBRARIES := javax.obex telephony-common libprotobuf-java-micro services.net
-LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard bluetooth.mapsapi sap-api-java-static android-support-v4 services.net
+LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard bluetooth.mapsapi sap-api-java-static services.net
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+        android-support-v4
 LOCAL_PROTOC_OPTIMIZE_TYPE := micro
 
 LOCAL_REQUIRED_MODULES := bluetooth.default