Fix make file to fix build
Fix a bug in android_device
Merging kwd commit 5861bf1edda18872676d02749794ed64da67dfc8
Change-Id: Id063ea653f47c7743102c912a8480c0410df6465
diff --git a/ScriptingLayerForAndroid/Android.mk b/ScriptingLayerForAndroid/Android.mk
index 40fef75..9a8b5ab 100644
--- a/ScriptingLayerForAndroid/Android.mk
+++ b/ScriptingLayerForAndroid/Android.mk
@@ -2,7 +2,6 @@
include $(CLEAR_VARS)
-
LOCAL_PACKAGE_NAME := sl4a
LOCAL_CERTIFICATE := platform
@@ -12,9 +11,8 @@
LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := libGoogleAnalytics:../Common/libs/libGoogleAnalytics.jar
-
-LOCAL_STATIC_JAVA_LIBRARIES := guava android-common locale_platform GoogleAnalytics
+LOCAL_JAVA_LIBRARIES := libGoogleAnalytics
+LOCAL_STATIC_JAVA_LIBRARIES := guava android-common 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
@@ -25,10 +23,13 @@
include $(BUILD_PACKAGE)
+include $(CLEAR_VARS)
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := locale_platform:libs/locale_platform.jar
+include $(BUILD_MULTI_PREBUILT)
+
+
# only include rules to build other stuff for the original package, not the derived package.
#ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
# additionally, build unit tests in a separate .apk
include $(call all-makefiles-under,$(LOCAL_PATH))
#endif
-
-
