| ... |
... |
@@ -15,7 +15,9 @@ mkdir pluggable_transports && cd pluggable_transports |
|
15
|
15
|
|
|
16
|
16
|
tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]
|
|
17
|
17
|
tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
|
|
18
|
|
-tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
|
|
|
18
|
+[% IF c('input_files_by_name/conjure') -%]
|
|
|
19
|
+ tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
|
|
|
20
|
+[% END -%]
|
|
19
|
21
|
|
|
20
|
22
|
# add per-platform pt extension
|
|
21
|
23
|
awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json
|
| ... |
... |
@@ -33,11 +35,15 @@ cd $distdir |
|
33
|
35
|
mkdir -p aar/assets/common
|
|
34
|
36
|
|
|
35
|
37
|
cp -a tor/libTor.so aar/jni/$abi/
|
|
36
|
|
- cp -a tor/pluggable_transports/conjure-client aar/jni/$abi/libConjure.so
|
|
37
|
38
|
cp -a tor/pluggable_transports/lyrebird aar/jni/$abi/libObfs4proxy.so
|
|
38
|
39
|
cp -a tor/pluggable_transports/snowflake-client aar/jni/$abi/libSnowflake.so
|
|
|
40
|
+ [% IF c('input_files_by_name/conjure') -%]
|
|
|
41
|
+ cp -a tor/pluggable_transports/conjure-client aar/jni/$abi/libConjure.so
|
|
|
42
|
+ [% END -%]
|
|
39
|
43
|
|
|
40
|
|
- cp -a data/* aar/assets/common/
|
|
|
44
|
+ # tor-browser-build#41224, tor-browser#42607: Currently we do not use the
|
|
|
45
|
+ # GeoIP databases. So, we avoid copying them to save space on the final APK.
|
|
|
46
|
+ # cp -a data/* aar/assets/common/
|
|
41
|
47
|
|
|
42
|
48
|
cp -a tor/pluggable_transports/pt_config.json aar/assets/common/
|
|
43
|
49
|
|
| ... |
... |
@@ -57,4 +63,4 @@ cd $distdir |
|
57
|
63
|
tar_src => tar_src,
|
|
58
|
64
|
tar_args => '-czvf' _ dest_dir _ '/' _ c('filename') _ '/tor-expert-bundle.tar.gz',
|
|
59
|
65
|
});
|
|
60
|
|
-%] |
|
|
\ No newline at end of file |
|
|
66
|
+%] |