Verified Commit 1b574d24 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 41123: Use GeckoView apks in browser.

Now the APKs are produced in the GeckoView project, rather than
firefox-android.
parent 070bc3fd
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@
[% c("var/set_default_env") -%]
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]

tar -xf $rootdir/[% c('input_files_by_name/firefox-android') %]
tar -xf $rootdir/[% c('input_files_by_name/fenix') %]

assets_dir=assets
ext_dir=$assets_dir/extensions
qa_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-qa-[% c("var/osname") %]-[% c("version") %].apk
apk=$rootdir/firefox-android/*-[% c("var/abi") %]-*.apk
apk=$rootdir/geckoview/*-[% c("var/abi") %]-*.apk

# tor-browser-build#40920
sorted_baseline_apk=$(basename $apk .apk)_sorted_baseline.apk
@@ -52,7 +52,7 @@ mkdir apk
pushd apk
7zz x "$apk"
cp -R ../assets ./
find -type f -exec touch -m -t '[% USE date; date.format(pc("firefox-android", "timestamp"), format = "%Y%m%d%H%M") %]' {} \;
find -type f -exec touch -m -t '[% USE date; date.format(pc("geckoview", "timestamp"), format = "%Y%m%d%H%M") %]' {} \;
find -type f ! -name resources.arsc -printf '%P\n' | sort > ../files.txt
7zz a -tzip -mx9 -mtc- -spf ../repacked.apk @../files.txt
# resources.arsc must not be compressed as per the APK specifications
+3 −2
Original line number Diff line number Diff line
@@ -88,8 +88,9 @@ input_files:
    name: src-firefox
    pkg_type: src-tarballs
    enable: '[% c("var/macos") %]'
  - project: firefox-android
    name: firefox-android
  - project: geckoview
    name: fenix
    pkg_type: build_apk
    enable: '[% c("var/android") %]'
  - project: tor-expert-bundle
    name: tor-expert-bundle