more cleanup, and removal of old orbot work
This commit is contained in:
n8fr8
parent
91b73b1f6b
commit
a810a5add9
|
|
@ -1,3 +0,0 @@
|
||||||
Manifest-Version: 1.0
|
|
||||||
Sealed: true
|
|
||||||
|
|
||||||
92
build.xml
92
build.xml
|
|
@ -1,92 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project name="Orbot" default="help">
|
|
||||||
|
|
||||||
<!-- The local.properties file is created and updated by the 'android' tool.
|
|
||||||
It contains the path to the SDK. It should *NOT* be checked into
|
|
||||||
Version Control Systems. -->
|
|
||||||
<property file="local.properties" />
|
|
||||||
|
|
||||||
<!-- The ant.properties file can be created by you. It is only edited by the
|
|
||||||
'android' tool to add properties to it.
|
|
||||||
This is the place to change some Ant specific build properties.
|
|
||||||
Here are some properties you may want to change/update:
|
|
||||||
|
|
||||||
source.dir
|
|
||||||
The name of the source directory. Default is 'src'.
|
|
||||||
out.dir
|
|
||||||
The name of the output directory. Default is 'bin'.
|
|
||||||
|
|
||||||
For other overridable properties, look at the beginning of the rules
|
|
||||||
files in the SDK, at tools/ant/build.xml
|
|
||||||
|
|
||||||
Properties related to the SDK location or the project target should
|
|
||||||
be updated using the 'android' tool with the 'update' action.
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your
|
|
||||||
application and should be checked into Version Control Systems.
|
|
||||||
|
|
||||||
-->
|
|
||||||
<property file="ant.properties" />
|
|
||||||
|
|
||||||
<!-- if sdk.dir was not set from one of the property file, then
|
|
||||||
get it from the ANDROID_HOME env var.
|
|
||||||
This must be done before we load project.properties since
|
|
||||||
the proguard config can use sdk.dir -->
|
|
||||||
<property environment="env" />
|
|
||||||
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
|
|
||||||
<isset property="env.ANDROID_HOME" />
|
|
||||||
</condition>
|
|
||||||
|
|
||||||
<!-- The project.properties file is created and updated by the 'android'
|
|
||||||
tool, as well as ADT.
|
|
||||||
|
|
||||||
This contains project specific properties such as project target, and library
|
|
||||||
dependencies. Lower level build properties are stored in ant.properties
|
|
||||||
(or in .classpath for Eclipse projects).
|
|
||||||
|
|
||||||
This file is an integral part of the build system for your
|
|
||||||
application and should be checked into Version Control Systems. -->
|
|
||||||
<loadproperties srcFile="project.properties" />
|
|
||||||
|
|
||||||
<!-- quick check on sdk.dir -->
|
|
||||||
<fail
|
|
||||||
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
|
|
||||||
unless="sdk.dir"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Import per project custom build rules if present at the root of the project.
|
|
||||||
This is the place to put custom intermediary targets such as:
|
|
||||||
-pre-build
|
|
||||||
-pre-compile
|
|
||||||
-post-compile (This is typically used for code obfuscation.
|
|
||||||
Compiled code location: ${out.classes.absolute.dir}
|
|
||||||
If this is not done in place, override ${out.dex.input.absolute.dir})
|
|
||||||
-post-package
|
|
||||||
-post-build
|
|
||||||
-pre-clean
|
|
||||||
-->
|
|
||||||
<import file="custom_rules.xml" optional="true" />
|
|
||||||
|
|
||||||
<!-- Import the actual build file.
|
|
||||||
|
|
||||||
To customize existing targets, there are two options:
|
|
||||||
- Customize only one target:
|
|
||||||
- copy/paste the target into this file, *before* the
|
|
||||||
<import> task.
|
|
||||||
- customize it to your needs.
|
|
||||||
- Customize the whole content of build.xml
|
|
||||||
- copy/paste the content of the rules files (minus the top node)
|
|
||||||
into this file, replacing the <import> task.
|
|
||||||
- customize to your needs.
|
|
||||||
|
|
||||||
***********************
|
|
||||||
****** IMPORTANT ******
|
|
||||||
***********************
|
|
||||||
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
|
||||||
in order to avoid having your file be overridden by tools such as "android update project"
|
|
||||||
-->
|
|
||||||
<!-- version-tag: 1 -->
|
|
||||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
|
||||||
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
if [ $# -ne 2 ]; then
|
|
||||||
echo "Usage: $0 /path/to/Orbot-v15.0.1.apk /another/Orbot-v15.0.1.apk"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
|
|
||||||
test -e "$1"
|
|
||||||
test -e "$2"
|
|
||||||
|
|
||||||
tmpdir=`mktemp -d /tmp/.compare-apks.XXXXXXXXXX`
|
|
||||||
apk1=$(basename $1)
|
|
||||||
apk2=$(basename $2)
|
|
||||||
sourcedir1=$(cd `dirname $1` && pwd)
|
|
||||||
sourcedir2=$(cd `dirname $2` && pwd)
|
|
||||||
apkname1=`echo $apk1 | sed 's,\.apk$,,'`
|
|
||||||
apkname2=`echo $apk2 | sed 's,\.apk$,,'`
|
|
||||||
dir1=$tmpdir/`echo $(dirname $1) | sed 's,[/ ],_,g'`-$apkname1
|
|
||||||
dir2=$tmpdir/`echo $(dirname $2) | sed 's,[/ ],_,g'`-$apkname2
|
|
||||||
|
|
||||||
mkdir -p $dir1/zip
|
|
||||||
cd $dir1/zip
|
|
||||||
unzip "$sourcedir1/$apk1"
|
|
||||||
cd ..
|
|
||||||
apktool d --no-res --no-src "$sourcedir1/$apk1"
|
|
||||||
mv "$apkname1" apktool
|
|
||||||
# strip the full path to the zip for the comparison
|
|
||||||
unzip -l "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-l.txt
|
|
||||||
unzip -lv "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-lv.txt
|
|
||||||
zipinfo -lv "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/zipinfo-lv.txt
|
|
||||||
xxd "$sourcedir1/$apk1" > $dir1/xxd
|
|
||||||
for f in $dir1/zip/assets/*/*; do
|
|
||||||
xxd $f > $dir1/xxd-$(basename $f)
|
|
||||||
done
|
|
||||||
|
|
||||||
mkdir -p $dir2/zip
|
|
||||||
cd $dir2/zip
|
|
||||||
unzip "$sourcedir2/$apk2"
|
|
||||||
cd ..
|
|
||||||
apktool d --no-res --no-src "$sourcedir2/$apk2"
|
|
||||||
mv "$apkname2" apktool
|
|
||||||
# strip the full path to the zip for the comparison
|
|
||||||
unzip -l "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-l.txt
|
|
||||||
unzip -lv "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-lv.txt
|
|
||||||
zipinfo -lv "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/zipinfo-lv.txt
|
|
||||||
xxd "$sourcedir2/$apk2" > $dir2/xxd
|
|
||||||
for f in $dir2/zip/assets/*/*; do
|
|
||||||
xxd $f > $dir2/xxd-$(basename $f)
|
|
||||||
done
|
|
||||||
|
|
||||||
if which meld > /dev/null; then
|
|
||||||
meld $dir1 $dir2
|
|
||||||
elif which opendiff > /dev/null; then
|
|
||||||
opendiff $dir1 $dir2
|
|
||||||
else
|
|
||||||
echo "ERROR: meld or opendiff required for the comparison!"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf $dir1 $dir2
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Generator: flash2svg, http://dissentgraphics.com/tools/flash2svg -->
|
|
||||||
<svg xmlns:xlink="http://www.w3.org/1999/xlink" id="Tor" image-rendering="optimizeSpeed" baseProfile="basic" version="1.1" style="background-color:#ffffff" x="0px" y="0px" width="1024px" height="1024px" viewBox="0 0 1024 1024" enable-background="new 0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<defs transform="matrix(1 0 0 1 0 0) "/>
|
|
||||||
<g id="shadow">
|
|
||||||
<g id="shape">
|
|
||||||
<path id="path" fill="#000000" fill-opacity="0.09803921568627451" d="M969.65,351.3 Q961.05,330.45 950.25,310.45 C946.2,302.9 941.9,295.4 937.35,288.05 917.8,256.35 893.95,226.4 865.8,198.25 773.65,106.1 662.35,60 532,60 401.65,60 290.4,106.1 198.25,198.25 106.1,290.4 60,401.65 60,532 60,662.35 106.1,773.65 198.25,865.8 290.4,957.95 401.65,1004 532,1004 662.35,1004 773.65,957.95 865.8,865.8 916.55,815 953.35,758.4 976.15,696.05 994.7,645.2 1004,590.55 1004,532 1004,487.1 998.55,444.45 987.6,404.05 986.35,399.5 985.05,394.95 983.7,390.45 979.6,377.15 974.9,364.1 969.65,351.3z"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<g id="bg">
|
|
||||||
<g id="shape2">
|
|
||||||
<path id="path1" fill="#4F3663" fill-opacity="1" d="M969.75,394 C968.65,389.65 967.4,385 966.1,380.4 963.6,371.65 960.75,362.8 957.65,354.05 951.2,335.8 943.5,318 934.5,300.4 930.7,293 926.55,285.45 922.2,278 901.9,243.5 876.4,210.8 845.85,180.25 806.9,141.3 764.5,110.55 718.35,87.9 679.05,68.6 636.9,55.35 592.2,48.2 575.95,45.6 559.4,43.8 542.15,42.85 532.45,42.3 522.3,42 512.05,42 502.7,42 493.45,42.25 484.15,42.75 477.45,43.1 470.8,43.55 464.1,44.2 407.25,49.4 354.3,64 305.15,88.2 259.55,110.6 217.25,141.3 178.3,180.25 89.05,269.5 43,376.75 40.2,501.75 Q40.05,507.85 40.05,514 C40.05,644.35 86.15,755.65 178.3,847.8 263.55,933.05 365.15,978.85 483,985.2 483.35,985.25 483.75,985.25 484.15,985.3 484.3,985.3 484.4,985.3 484.55,985.3 493.05,985.75 501.15,986 509.05,986 510.25,986 511.15,986 512.05,986 522.35,986 532.55,985.7 542.15,985.2 544.65,985.05 546.9,984.9 549.1,984.75 569.3,983.3 589,980.7 607.8,977.05 615.75,975.5 623.6,973.75 631.2,971.9 712,951.6 783.35,910.3 845.85,847.8 851.95,841.7 857.85,835.55 863.35,829.5 903.2,785.65 933.1,737.9 953.2,686 962.3,662.55 969.35,638.25 974.5,612.95 979.7,587.15 982.8,560.3 983.75,532.5 983.95,526.45 984.05,520.25 984.05,514 984.05,513.35 984.05,512.65 984.05,512 984.05,511.65 984.05,511.35 984.05,511 984.05,507.9 984,504.8 983.95,501.65 983.1,464.45 978.4,428.65 969.75,394z"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<g id="bg1">
|
|
||||||
<g id="shape4">
|
|
||||||
<path id="path2" fill="#000000" fill-opacity="0.2" d="M974.5,612.95 C977.85,596.3 980.35,579.25 981.95,561.65 L589.25,168.95 558.05,199 489.375,130.325 456.05,212.05 507.525,263.525 290.5,850.05 417.8,977.35 C439.25,981.4 460.85,984 483,985.2 483.35,985.25 483.75,985.25 484.15,985.3 484.3,985.3 484.4,985.3 484.55,985.3 493.05,985.75 501.15,986 509.05,986 Q510.55,986 512.05,986 C522.35,986 532.55,985.7 542.15,985.2 544.65,985.05 546.9,984.9 549.1,984.75 569.3,983.3 589,980.7 607.8,977.05 615.75,975.5 623.6,973.75 631.2,971.9 712,951.6 783.35,910.3 845.85,847.8 851.95,841.7 857.85,835.55 863.35,829.5 903.2,785.65 933.1,737.9 953.2,686 962.3,662.55 969.35,638.25 974.5,612.95z"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<g id="Calque.__208">
|
|
||||||
<g id="shape6">
|
|
||||||
<path id="path3" fill="#FDFCDF" fill-opacity="1" d="M433.05,252.05 L433.05,265.45 C431.35,307.5 413.05,338.25 378.2,357.65 375.15,359.1 372.1,360.65 369.05,362.3 342.3,376.5 317.35,395.15 294.25,418.25 234.1,478.4 204.05,551 204.05,636.05 204.05,721.1 234.1,793.7 294.25,853.85 354.4,914 427,944.05 512.05,944.05 513.5,944.05 514.95,944.05 516.15,944.05 L516.15,944.025 L516.15,879.625 L516.15,879.65 C514.8,879.65 513.4,879.65 512.05,879.65 447.2,879.65 391.85,856.7 346,810.85 300.15,765 277.25,709.7 277.25,644.85 277.25,580 300.15,524.65 346,478.8 391.85,432.95 447.2,410.05 512.05,410.05 513.4,410.05 514.8,410.05 516.15,410.1 L516.15,410.075 L516.15,265.625 L516.15,265.65 C487.45,263.45 459.75,257.85 433.05,252.05z"/>
|
|
||||||
<path id="path4" fill="#EAEACE" fill-opacity="1" d="M516.15,410.1 C514.8,410.05 513.4,410.05 512.05,410.05 447.2,410.05 391.85,432.95 346,478.8 300.15,524.65 277.25,580 277.25,644.85 277.25,709.7 300.15,765 346,810.85 391.85,856.7 447.2,879.65 512.05,879.65 513.4,879.65 514.8,879.65 516.15,879.65 L516.15,879.625 L516.15,809.65 C515.75,809.7 515.35,809.7 514.9,809.7 513.95,809.7 513,809.7 512.05,809.7 504.55,809.7 497.25,809.25 490.15,808.4 485.05,807.75 480.05,806.9 475.1,805.8 445.95,799.3 420.15,784.8 397.6,762.25 366,730.65 350.2,692.5 350.2,647.85 350.2,603.1 366,564.95 397.6,533.3 420.15,510.85 445.95,496.35 475.1,489.9 480.05,488.8 485.05,487.95 490.15,487.3 497.25,486.4 504.55,485.95 512.05,485.95 513,485.95 513.95,485.95 514.9,485.95 515.35,485.95 515.75,485.95 516.15,486 L516.15,485.975 L516.15,410.075"/>
|
|
||||||
<path id="path5" fill="#735A93" fill-opacity="1" d="M820.05,636.05 Q820.05,508.45 729.85,418.25 C706,394.4 680.15,375.25 652.05,360.7 613.9,343.05 593.6,310.2 591.05,262.05 565.35,266.9 540.4,267.45 516.15,265.65 L516.15,265.625 L516.15,410.075 516.15,485.975 516.15,556.35 516.15,743.675 516.15,809.65 516.15,879.625 516.15,944.025 L516.15,944.05 C599.6,943.05 670.75,912.95 729.85,853.85 790,793.7 820.05,721.1 820.05,636.05z"/>
|
|
||||||
<path id="path6" fill="#D1D1B8" fill-opacity="1" d="M512.05,485.95 C504.55,485.95 497.25,486.4 490.15,487.3 485.05,487.95 480.05,488.8 475.1,489.9 445.95,496.35 420.15,510.85 397.6,533.3 366,564.95 350.2,603.1 350.2,647.85 350.2,692.5 366,730.65 397.6,762.25 420.15,784.8 445.95,799.3 475.1,805.8 480.05,806.9 485.05,807.75 490.15,808.4 497.25,809.25 504.55,809.7 512.05,809.7 513,809.7 513.95,809.7 514.9,809.7 515.35,809.7 515.75,809.7 516.15,809.65 L516.15,743.675 L516.15,743.7 C515.6,743.7 515,743.7 514.4,743.75 514.2,743.75 513.95,743.75 513.7,743.75 513.15,743.75 512.6,743.75 512.05,743.75 507.7,743.75 503.5,743.5 499.35,743 499.2,743 499.1,743 498.95,742.95 496.1,742.6 493.35,742.1 490.65,741.55 484.25,740.1 478.15,738 472.3,735.25 462.7,730.7 453.85,724.4 445.75,716.3 427.45,698 418.3,675.9 418.3,650.05 418.3,624.1 427.45,602 445.75,583.7 453.85,575.65 462.7,569.35 472.3,564.8 478.15,562.05 484.25,559.95 490.65,558.55 493.35,557.95 496.1,557.45 498.95,557.1 499.1,557.05 499.2,557.05 499.35,557.05 503.5,556.5 507.7,556.25 512.05,556.25 512.6,556.25 513.15,556.25 513.7,556.25 513.95,556.25 514.2,556.25 514.4,556.3 515,556.3 515.6,556.3 516.15,556.35 L516.15,485.975 L516.15,486 C515.75,485.95 515.35,485.95 514.9,485.95 513.95,485.95 513,485.95 512.05,485.95z"/>
|
|
||||||
<path id="path7" fill="#BFBFA9" fill-opacity="1" d="M512.05,556.25 C507.7,556.25 503.5,556.5 499.35,557.05 499.2,557.05 499.1,557.05 498.95,557.1 496.1,557.45 493.35,557.95 490.65,558.55 484.25,559.95 478.15,562.05 472.3,564.8 462.7,569.35 453.85,575.65 445.75,583.7 427.45,602 418.3,624.1 418.3,650.05 418.3,675.9 427.45,698 445.75,716.3 453.85,724.4 462.7,730.7 472.3,735.25 478.15,738 484.25,740.1 490.65,741.55 493.35,742.1 496.1,742.6 498.95,742.95 499.1,743 499.2,743 499.35,743 503.5,743.5 507.7,743.75 512.05,743.75 512.6,743.75 513.15,743.75 513.7,743.75 513.95,743.75 514.2,743.75 514.4,743.75 515,743.7 515.6,743.7 516.15,743.7 L516.15,743.675 L516.15,556.35 C515.6,556.3 515,556.3 514.4,556.3 514.2,556.25 513.95,556.25 513.7,556.25 513.15,556.25 512.6,556.25 512.05,556.25z"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<g id="Calque.__209">
|
|
||||||
<g id="shape13">
|
|
||||||
<path id="path8" fill="#78AF52" fill-opacity="1" d="M443.4,84.35 C443.05,85.65 442.7,86.95 442.45,88.05 Q411.45,209.9 507.6,249.75 C526.35,187.5 506.65,133.75 448.25,88.05 446.85,86.95 445.15,85.65 443.4,84.35z"/>
|
|
||||||
<path id="path9" fill="#78AF52" fill-opacity="1" d="M524.35,249.75 C518.9,208.95 540.6,181.85 589.25,168.95 583.95,213.85 562.35,240.75 524.35,249.75"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 7.6 KiB |
|
|
@ -1,2 +1 @@
|
||||||
include ':jsocksAndroid', ':orbotservice'
|
include ':orbotservice'
|
||||||
include ':app'
|
|
||||||
|
|
|
||||||
28
setup-ant
28
setup-ant
|
|
@ -1,28 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
set -x
|
|
||||||
|
|
||||||
if ! which android > /dev/null; then
|
|
||||||
if [ -z $ANDROID_HOME ]; then
|
|
||||||
if [ -e ~/.android/bashrc ]; then
|
|
||||||
. ~/.android/bashrc
|
|
||||||
else
|
|
||||||
echo "'android' not found, ANDROID_HOME must be set!"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
export PATH="${ANDROID_HOME}/tools:$PATH"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# fetch target from project.properties
|
|
||||||
eval `grep '^target=' project.properties`
|
|
||||||
|
|
||||||
projectname=`sed -n 's,.*name="app_name">\(.*\)<.*,\1,p' res/values/strings.xml`
|
|
||||||
|
|
||||||
android update project --path . --name $projectname --target $target --subprojects
|
|
||||||
|
|
||||||
for lib in `sed -n 's,^android\.library\.reference\.[0-9][0-9]*=\(.*\),\1,p' project.properties`; do
|
|
||||||
android update lib-project --path $lib --target $target
|
|
||||||
done
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB |
Loading…
Reference in New Issue