Skip to content

Commit

Permalink
Updated Opaque to build in Android Studio.
Browse files Browse the repository at this point in the history
  • Loading branch information
iiordanov committed Apr 7, 2018
1 parent f5ac1aa commit e7ea3e6
Show file tree
Hide file tree
Showing 23 changed files with 400 additions and 43 deletions.
23 changes: 23 additions & 0 deletions .gitignore
Expand Up @@ -21,6 +21,8 @@ Opaque/jni/libs/deps/
Opaque/jni/libs/tar/
Opaque/gst-build-x86/
Opaque/java/
Opaque/debug/
Opaque/release/
*/libs/sqlcipher-javadoc.jar
*/libs/sqlcipher.jar
*/libs/*/libgstreamer_android.so
Expand Down Expand Up @@ -119,6 +121,25 @@ obj/
.idea/dynamic.xml
.idea/uiDesigner.xml

Opaque/.idea/libraries/
Opaque/.idea/workspace.xml
Opaque/.idea/tasks.xml
Opaque/.idea/.name
Opaque/.idea/compiler.xml
Opaque/.idea/copyright/profiles_settings.xml
Opaque/.idea/encodings.xml
Opaque/.idea/misc.xml
Opaque/.idea/modules.xml
Opaque/.idea/scopes/scope_settings.xml
Opaque/.idea/dictionaries
Opaque/.idea/vcs.xml
Opaque/.idea/jsLibraryMappings.xml
Opaque/.idea/datasources.xml
Opaque/.idea/dataSources.ids
Opaque/.idea/sqlDataSources.xml
Opaque/.idea/dynamic.xml
Opaque/.idea/uiDesigner.xml

# OS-specific files
.DS_Store
.DS_Store?
Expand Down Expand Up @@ -166,3 +187,5 @@ fabric.properties
!/gradle/wrapper/gradle-wrapper.jar

# End of AndroidStudio ###


8 changes: 4 additions & 4 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Opaque/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Opaque/.idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Opaque/AndroidManifest.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.undatech.opaque"
android:versionCode="1446"
android:versionName="1.4.4" >

<uses-sdk
android:minSdkVersion="12"
android:targetSdkVersion="12" />
android:minSdkVersion="14"
android:targetSdkVersion="14" />

<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE" />
Expand All @@ -25,7 +26,6 @@
android:anyDensity="true"/>

<application
android:debuggable="false"
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
Expand Down Expand Up @@ -134,7 +134,7 @@
<data android:scheme="content" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.vv" />
</intent-filter>
</activity>
<uses-library android:required="false" name="com.sec.android.app.multiwindow"> </uses-library>
<uses-library android:required="false" android:name="com.sec.android.app.multiwindow"> </uses-library>
<meta-data android:name="com.sec.android.support.multiwindow"
android:value="true" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W"
Expand Down
53 changes: 53 additions & 0 deletions Opaque/build.gradle
@@ -0,0 +1,53 @@
apply plugin: 'com.android.application'

// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
}
}

allprojects {
repositories {
jcenter()
}
}

android {
compileSdkVersion 25
buildToolsVersion "26.0.2"
useLibrary 'org.apache.http.legacy'

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}

sourceSets {
main.java.srcDirs += 'src/main/java'
}

sourceSets.main {
jniLibs.srcDirs += ['src/main/jniLibs']
}

packagingOptions {
exclude 'META-INF/DEPENDENCIES'
}
}

dependencies {
compile 'com.android.support:appcompat-v7:25.3.1'
//compile 'com.android.support:appcompat-v7:22.2.0'
//compile files ('libs/httpcore-4.4.4.jar')
//compile files ('libs/httpclient-4.5.2.jar')
//compile 'org.apache.httpcomponents:httpclient:4.5.5'
compile 'org.apache.httpcomponents:httpcore:4.4.9'
}

Binary file added Opaque/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions Opaque/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
#Sat Apr 07 10:32:47 EDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
160 changes: 160 additions & 0 deletions Opaque/gradlew
@@ -0,0 +1,160 @@
#!/usr/bin/env bash

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
echo "$*"
}

die ( ) {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

0 comments on commit e7ea3e6

Please sign in to comment.