From 83b229b48a7d822416995d4c8b2911e8e8aa5882 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Thu, 29 Dec 2011 06:29:10 +0300
Subject: [PATCH] [android] Removed invalid library reference and updated build
 scripts

---
 android/jni/Android.mk       | 15 +++------------
 android/jni/Application.mk   |  3 ++-
 tools/autobuild/send_mail.py | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 tools/autobuild/send_mail.py

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 15c87895d6..a30de29342 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -42,11 +42,11 @@ LOCAL_SRC_FILES := \
 	nv_event/nv_event_queue.cpp \
 	nv_event/nv_event.cpp \
 	nv_time/nv_time.cpp
-	
+
 LOCAL_LDLIBS := -llog -lGLESv1_CM \
 		-lmap -lversion -lsearch -lstorage -lindexer -lyg -lplatform \
 		-lgeometry -lcoding -lbase -lexpat -lfreetype -lfribidi -lzlib -lbzip2 \
-		-ljansson -ltomcrypt -lprotobuf ./obj/local/armeabi/libstdc++.a
+		-ljansson -ltomcrypt -lprotobuf ./obj/local/$(TARGET_ARCH_ABI)/libgnustl_static.a
 
 LOCAL_LDLIBS += -Wl,--gc-sections
 
@@ -60,15 +60,6 @@ else
   LOCAL_CFLAGS += -O3
 endif
 
-OMIM_ABI := armeabi
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-  OMIM_ABI := armeabi-v7a
-else
-  ifeq ($(TARGET_ARCH_ABI),x86)
-    OMIM_ABI := x86
-  endif
-endif
-
-LOCAL_LDLIBS += -L../../omim-android-$(OMIM_CONFIG)-$(OMIM_ABI)/out/$(OMIM_CONFIG)
+LOCAL_LDLIBS += -L../../omim-android-$(OMIM_CONFIG)-$(TARGET_ARCH_ABI)/out/$(OMIM_CONFIG)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index f7dc0371f9..e710ba8cc6 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,7 +1,8 @@
 APP_PLATFORM := android-5
 APP_ABI := armeabi armeabi-v7a
 APP_STL := gnustl_static
-APP_CFLAGS += -I../3party/boost
+LOCAL_PATH := $(call my-dir)
+APP_CFLAGS += -I$(LOCAL_PATH)/../../3party/boost
 
 ifeq ($(NDK_DEBUG),1)
   APP_OPTIM := debug
diff --git a/tools/autobuild/send_mail.py b/tools/autobuild/send_mail.py
new file mode 100644
index 0000000000..6405b853dc
--- /dev/null
+++ b/tools/autobuild/send_mail.py
@@ -0,0 +1,33 @@
+# Send given file in the body of email
+# Call syntax: <script> <to> <subject> <file>
+
+import smtplib
+import sys
+import string
+
+if len(sys.argv) < 4:
+  print "Usage: " + sys.argv[0] + " <to> <subject> <file>"
+  exit(1)
+
+FROM = 'Mona Lisa <mapswithme@gmail.com>'
+TO = sys.argv[1]
+SUBJECT = sys.argv[2]
+FILE_TEXT = open(sys.argv[3], 'r').read()
+
+BODY = string.join((
+        "From: %s" % FROM,
+        "To: %s" % TO,
+        "Subject: %s" % SUBJECT ,
+        "",
+        FILE_TEXT
+        ), "\r\n")
+
+USER = 'mapswithme'
+PASS = 'MapsWithMeP@ssw0rd'
+
+# The actual mail send
+server = smtplib.SMTP('smtp.gmail.com:587')
+server.starttls()
+server.login(USER, PASS)
+server.sendmail(FROM, TO, BODY)
+server.quit()