From 3f8e2f6569f893a49bf1819416cae792c702d370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 20 Jun 2013 18:03:05 +0200 Subject: No untracked files. Added two auxiliar files: prepareTestProviderAPI.sh is updated in feature/authGui_tests. proguard-project.txt is completely commented, but I think it may be suitable to version control. --- .gitignore | 4 ++++ prepareTestProviderAPI.sh | 15 +++++++++++++++ proguard-project.txt | 20 ++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100755 prepareTestProviderAPI.sh create mode 100644 proguard-project.txt diff --git a/.gitignore b/.gitignore index 11526f8..9aa5a03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ obj bin gen +libs openvpn/.git openvpn/autom4te.cache openvpn/aclocal.m4 @@ -65,3 +66,6 @@ id.zip /hosts-for-android-emulator.bk /build-native.sh.bk /build-native.sh~ + +build.gradle +local.properties diff --git a/prepareTestProviderAPI.sh b/prepareTestProviderAPI.sh new file mode 100755 index 0000000..0eca85a --- /dev/null +++ b/prepareTestProviderAPI.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ -z "$1" ] +then + echo Usage: prepareTestProviderAPI.sh \"project folder\" + exit 0; +fi + +PROJECT_FOLDER=$1 +hosts_file="hosts-for-tests" + +adb shell mount -o rw,remount -t yaffs2 /dev/block/mtdblock3 /system +adb push $PROJECT_FOLDER/$hosts_file /system/etc/hosts + +echo "Pushed $PROJECT_FOLDER/$hosts_file" diff --git a/proguard-project.txt b/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} -- cgit v1.2.3