Merge branch 'orbot' into 'master'
This should fix Orbot failure Thanks to deki See merge request !408
This commit is contained in:
commit
170905d727
|
@ -199,7 +199,7 @@ Build:14.1.3-PIE,130
|
|||
|
||||
Build:14.1.4-noPIE,132
|
||||
commit=v14.1.4
|
||||
init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update
|
||||
init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update --init
|
||||
submodules=yes
|
||||
rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo
|
||||
prebuild=mv AndroidManifest.KITKAT_AND_LOWER.xml AndroidManifest.xml && echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties
|
||||
|
@ -208,7 +208,7 @@ Build:14.1.4-noPIE,132
|
|||
|
||||
Build:14.1.4-PIE,133
|
||||
commit=v14.1.4
|
||||
init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update
|
||||
init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update --init
|
||||
submodules=yes
|
||||
rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties
|
||||
|
|
Loading…
Reference in a new issue