commit 37fa39fad3b304ff796996abb3adb23292e53b20
author Ang Li <angli@google.com> Tue Jun 17 10:58:53 2014 -0700
committer Ang Li <angli@google.com> Tue Jun 17 11:45:25 2014 -0700
tree 505da9fd76e9579610e77414235388198f3ae503
parent 624bba12e1344a02e779aca71b70fd7ede58d238

Fix libGoogleAnalytics in make file

Merging kwd commit 7f6da23e6da42b325306ae75c0d7f0e547167063
Change-Id: I5ed0e63ab52c66f56028c270cf9ff00c0ed2cbdd

ScriptingLayerForAndroid/Android.mk

diff --git a/ScriptingLayerForAndroid/Android.mk b/ScriptingLayerForAndroid/Android.mk
index 9a8b5ab..17d3e02 100644
--- a/ScriptingLayerForAndroid/Android.mk
+++ b/ScriptingLayerForAndroid/Android.mk
@@ -11,8 +11,9 @@
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 
-LOCAL_JAVA_LIBRARIES := libGoogleAnalytics
-LOCAL_STATIC_JAVA_LIBRARIES := guava android-common locale_platform
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libGoogleAnalytics:../Common/libs/libGoogleAnalytics.jar
+
+LOCAL_STATIC_JAVA_LIBRARIES := guava android-common libGoogleAnalytics locale_platform
 LOCAL_STATIC_JAVA_LIBRARIES += sl4a.Utils sl4a.Common sl4a.BluetoothFacade
 LOCAL_STATIC_JAVA_LIBRARIES += sl4a.SignalStrengthFacade sl4a.TextToSpeechFacade sl4a.WebCamFacade
 LOCAL_STATIC_JAVA_LIBRARIES += sl4a.InterpreterForAndroid sl4a.ScriptingLayer sl4a.QuickAction