From 224be050299691f2ca35d79f69aaf39d92fdbeaa Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 9 May 2012 14:22:15 +0200
Subject: Version 0.5.0 + minimal faq addition

---
 openssl/crypto/Android.mk | 44 ++++++++++++++++++++++----------------------
 openssl/ssl/Android.mk    | 24 ++++++++++++------------
 res/layout/faq.xml        | 10 ++++++++++
 res/values/strings.xml    |  2 ++
 4 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/openssl/crypto/Android.mk b/openssl/crypto/Android.mk
index fab9d57d..b0a3bcc3 100644
--- a/openssl/crypto/Android.mk
+++ b/openssl/crypto/Android.mk
@@ -504,30 +504,30 @@ include $(BUILD_STATIC_LIBRARY)
 
 #######################################
 # target shared library
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/../android-config.mk
+# include $(CLEAR_VARS)
+# include $(LOCAL_PATH)/../android-config.mk
 
-ifneq ($(TARGET_ARCH),x86)
-LOCAL_NDK_VERSION := 5
-LOCAL_SDK_VERSION := 9
-# Use the NDK prebuilt libz and libdl.
-LOCAL_LDFLAGS += -lz -ldl
-else
-LOCAL_SHARED_LIBRARIES += libz libdl
-endif
+# ifneq ($(TARGET_ARCH),x86)
+# LOCAL_NDK_VERSION := 5
+# LOCAL_SDK_VERSION := 9
+# # Use the NDK prebuilt libz and libdl.
+# LOCAL_LDFLAGS += -lz -ldl
+# else
+# LOCAL_SHARED_LIBRARIES += libz libdl
+# endif
 
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_CFLAGS += $(local_c_flags)
-LOCAL_C_INCLUDES += $(local_c_includes)
-ifeq ($(TARGET_ARCH),arm)
-	LOCAL_SRC_FILES += $(arm_src_files)
-	LOCAL_CFLAGS += $(arm_cflags)
-else
-	LOCAL_SRC_FILES += $(non_arm_src_files)
-endif
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libcrypto
-include $(BUILD_SHARED_LIBRARY)
+# LOCAL_SRC_FILES += $(local_src_files)
+# LOCAL_CFLAGS += $(local_c_flags)
+# LOCAL_C_INCLUDES += $(local_c_includes)
+# ifeq ($(TARGET_ARCH),arm)
+# 	LOCAL_SRC_FILES += $(arm_src_files)
+# 	LOCAL_CFLAGS += $(arm_cflags)
+# else
+# 	LOCAL_SRC_FILES += $(non_arm_src_files)
+# endif
+# LOCAL_MODULE_TAGS := optional
+# LOCAL_MODULE:= libcrypto
+# include $(BUILD_SHARED_LIBRARY)
 
 #######################################
 # Host shared library
diff --git a/openssl/ssl/Android.mk b/openssl/ssl/Android.mk
index 4fe7f196..87af2f3e 100644
--- a/openssl/ssl/Android.mk
+++ b/openssl/ssl/Android.mk
@@ -61,18 +61,18 @@ include $(BUILD_STATIC_LIBRARY)
 
 #######################################
 # target shared library
-include $(CLEAR_VARS)
-include $(LOCAL_PATH)/../android-config.mk
+# include $(CLEAR_VARS)
+# include $(LOCAL_PATH)/../android-config.mk
 
-ifneq ($(TARGET_ARCH),x86)
-LOCAL_NDK_VERSION := 5
-LOCAL_SDK_VERSION := 9
-endif
-LOCAL_SRC_FILES += $(local_src_files)
-LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES += libcrypto
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libssl
-include $(BUILD_SHARED_LIBRARY)
+# ifneq ($(TARGET_ARCH),x86)
+# LOCAL_NDK_VERSION := 5
+# LOCAL_SDK_VERSION := 9
+# endif
+# LOCAL_SRC_FILES += $(local_src_files)
+# LOCAL_C_INCLUDES += $(local_c_includes)
+# LOCAL_SHARED_LIBRARIES += libcrypto
+# LOCAL_MODULE_TAGS := optional
+# LOCAL_MODULE:= libssl
+# include $(BUILD_SHARED_LIBRARY)
 
 
diff --git a/res/layout/faq.xml b/res/layout/faq.xml
index 8cdf7326..6504afcf 100644
--- a/res/layout/faq.xml
+++ b/res/layout/faq.xml
@@ -33,6 +33,16 @@
             style="@style/faqitem"
             android:text="@string/tap_faq2" />
 
+        <TextView
+            style="@style/faqhead"
+            android:text="@string/faq_shortcut" />
+
+        <TextView
+            style="@style/faqitem"
+            android:text="@string/faq_howto_shortcut" />
+        
+        
+        
         <TextView
             style="@style/faqhead"
             android:text="@string/tap_mode" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5d7b5396..dcf33197 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -182,4 +182,6 @@
     <string name="faq_summary">frequently asked questions and some adivce</string>  
     <string name="copying_log_entries">Copying log entries</string>  
     <string name="faq_copying">To copy a single log entry press and and hold on the log entry. To copy/send the whole log use the Send Log option. Use the hardware menu button if not visible in the gui.</string>  
+    <string name="faq_shortcut">Shortcut to start</string>  
+    <string name="faq_howto_shortcut">You can place a shortcut to start OpenVPN on your desktop. Depending on your homescreen program you have to add a shortcut or a widget.</string>  
 </resources>
-- 
cgit v1.2.3