Bug 1548655 - Specify custom version file paths for Fennec builds. r=nalexander, a=release on a CLOSED TREE
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 03 May 2019 14:31:27 -0400
changeset 532718 cf273dce0debb09b0556f9023d16242c8f7e9b7c
parent 532717 571bc76da583cfbb4ffeb42c99905cd02e297cc3
child 532861 2265bfc5920d3e510c4edf9b0caf8e3eaf9bdc9c
push id11271
push userryanvm@gmail.com
push dateThu, 16 May 2019 14:33:11 +0000
treeherdermozilla-beta@cf273dce0deb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, release
bugs1548655
milestone68.0
Bug 1548655 - Specify custom version file paths for Fennec builds. r=nalexander, a=release on a CLOSED TREE Differential Revision: https://phabricator.services.mozilla.com/D29917
mobile/android/config/mozconfigs/android-aarch64/beta
mobile/android/config/mozconfigs/android-aarch64/debug
mobile/android/config/mozconfigs/android-aarch64/debug-beta
mobile/android/config/mozconfigs/android-aarch64/nightly
mobile/android/config/mozconfigs/android-api-16-frontend/nightly
mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
mobile/android/config/mozconfigs/android-api-16/beta
mobile/android/config/mozconfigs/android-api-16/debug
mobile/android/config/mozconfigs/android-api-16/debug-beta
mobile/android/config/mozconfigs/android-api-16/debug-searchfox
mobile/android/config/mozconfigs/android-api-16/nightly
mobile/android/config/mozconfigs/android-x86/beta
mobile/android/config/mozconfigs/android-x86/debug
mobile/android/config/mozconfigs/android-x86/debug-beta
mobile/android/config/mozconfigs/android-x86/nightly
mobile/android/config/mozconfigs/android-x86_64/beta
mobile/android/config/mozconfigs/android-x86_64/debug
mobile/android/config/mozconfigs/android-x86_64/debug-beta
mobile/android/config/mozconfigs/android-x86_64/nightly
mobile/android/config/version-files/beta/version.txt
mobile/android/config/version-files/beta/version_display.txt
mobile/android/config/version-files/nightly/version.txt
mobile/android/config/version-files/nightly/version_display.txt
mobile/android/config/version-files/release/version.txt
mobile/android/config/version-files/release/version_display.txt
--- a/mobile/android/config/mozconfigs/android-aarch64/beta
+++ b/mobile/android/config/mozconfigs/android-aarch64/beta
@@ -1,15 +1,16 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
 ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-version-file-path=mobile/android/config/version-files/beta
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-aarch64/debug
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug
@@ -8,10 +8,11 @@ ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-aarch64/debug-beta
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug-beta
@@ -6,10 +6,11 @@ ac_add_options --enable-debug
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-version-file-path=mobile/android/config/version-files/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-aarch64/nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/nightly
@@ -1,15 +1,16 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 export FENNEC_NIGHTLY=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
--- a/mobile/android/config/mozconfigs/android-api-16-frontend/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-frontend/nightly
@@ -24,14 +24,15 @@ ac_add_options --disable-tests
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export FENNEC_NIGHTLY=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly
@@ -29,16 +29,17 @@ ac_add_options --disable-tests
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export FENNEC_NIGHTLY=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
 
 # End ../android-api-16-frontend/nightly.
--- a/mobile/android/config/mozconfigs/android-api-16/beta
+++ b/mobile/android/config/mozconfigs/android-api-16/beta
@@ -5,16 +5,17 @@
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-version-file-path=mobile/android/config/version-files/beta
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
--- a/mobile/android/config/mozconfigs/android-api-16/debug
+++ b/mobile/android/config/mozconfigs/android-api-16/debug
@@ -12,10 +12,11 @@ ac_add_options --enable-debug
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16/debug-beta
+++ b/mobile/android/config/mozconfigs/android-api-16/debug-beta
@@ -10,10 +10,11 @@ ac_add_options --enable-debug
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-version-file-path=mobile/android/config/version-files/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16/debug-searchfox
+++ b/mobile/android/config/mozconfigs/android-api-16/debug-searchfox
@@ -12,15 +12,16 @@ ac_add_options --enable-debug
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 # Save rust analysis (this requires unlocking the unstable features,
 # which is done in the taskcluster task definition via RUSTC_BOOTSTRAP)
 export RUSTFLAGS="-Zsave-analysis"
 ac_add_options --enable-mozsearch-plugin
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-16/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16/nightly
@@ -5,16 +5,17 @@
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
--- a/mobile/android/config/mozconfigs/android-x86/beta
+++ b/mobile/android/config/mozconfigs/android-x86/beta
@@ -4,16 +4,17 @@
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
 ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-version-file-path=mobile/android/config/version-files/beta
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -13,10 +13,11 @@ ac_add_options --target=i686-linux-andro
 ac_add_options --with-android-min-sdk=16
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_POCKET=1
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/debug-beta
+++ b/mobile/android/config/mozconfigs/android-x86/debug-beta
@@ -11,10 +11,11 @@ ac_add_options --enable-debug
 # Engineering team.
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_POCKET=1
 
 ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-version-file-path=mobile/android/config/version-files/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -4,16 +4,17 @@
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
--- a/mobile/android/config/mozconfigs/android-x86_64/beta
+++ b/mobile/android/config/mozconfigs/android-x86_64/beta
@@ -1,15 +1,16 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android
 
 ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-version-file-path=mobile/android/config/version-files/beta
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
--- a/mobile/android/config/mozconfigs/android-x86_64/debug
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug
@@ -8,10 +8,11 @@ ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android
 
 export FENNEC_NIGHTLY=1
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86_64/debug-beta
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-beta
@@ -6,10 +6,11 @@ ac_add_options --enable-debug
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android
 
 export MOZILLA_OFFICIAL=1
 export MOZ_ANDROID_POCKET
 
 ac_add_options --with-branding=mobile/android/branding/beta
+ac_add_options --with-version-file-path=mobile/android/config/version-files/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86_64/nightly
+++ b/mobile/android/config/mozconfigs/android-x86_64/nightly
@@ -1,15 +1,16 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android
 
 ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-version-file-path=mobile/android/config/version-files/nightly
 
 export FENNEC_NIGHTLY=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
new file mode 100644
--- /dev/null
+++ b/mobile/android/config/version-files/beta/version.txt
@@ -0,0 +1,1 @@
+68.0
new file mode 100644
--- /dev/null
+++ b/mobile/android/config/version-files/beta/version_display.txt
@@ -0,0 +1,1 @@
+68.0b3
new file mode 100644
--- /dev/null
+++ b/mobile/android/config/version-files/nightly/version.txt
@@ -0,0 +1,1 @@
+68.0a1
new file mode 100644
--- /dev/null
+++ b/mobile/android/config/version-files/nightly/version_display.txt
@@ -0,0 +1,1 @@
+68.0a1
new file mode 100644
--- /dev/null
+++ b/mobile/android/config/version-files/release/version.txt
@@ -0,0 +1,1 @@
+68.0
new file mode 100644
--- /dev/null
+++ b/mobile/android/config/version-files/release/version_display.txt
@@ -0,0 +1,1 @@
+68.0