Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1578471 - consolidate NDK version detection; r=nalexander

Browse Source 
We have an `ndk_version_major` and an `ndk_version_minor` that have a
lot of duplicated code in them.  We could factor them into a single
function, but it seems better to just pull their logic into `ndk_version`
directly, rearranging that function to be IMHO more understandable.

Differential Revision: https://phabricator.services.mozilla.com/D44506

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nathan Froyd 2019-09-03 17:17:31 +00:00
parent 3607d54634
commit f29b892aa0
1 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
build/moz.configure/android-ndk.configure
View File

@ -86,42 +86,28 @@ def ndk_version(ndk):
# Building 'js/src' for non-Android.
return
with open(os.path.join(ndk, 'source.properties'), 'r') as f:
for line in f:
if not line.startswith('Pkg.Revision'):
continue
(_, version) = line.split('=')
if version:
return version.strip()
revision = [line for line in f if line.startswith('Pkg.Revision')]
if not revision:
die('Cannot determine NDK version from source.properties')
if len(revision) != 1:
die('Too many Pkg.Revision lines in source.properties')
(_, version) = revision[0].split('=')
if not version:
die('Unexpected Pkg.Revision line in source.properties')
die('Cannot determine NDK version from source.properties')
(major, minor, revision) = version.strip().split('.')
if not major or not minor:
die('Unexpected NDK version string: ' + version)
return namespace(
major=major,
minor=minor,
)
@depends(ndk_version)
def ndk_major_version(ndk_version):
if not ndk_version:
# Building 'js/src' for non-Android.
return
(major, minor, revision) = ndk_version.split('.')
if major:
return major
die('Unexpected NDK version string: ' + ndk_version)
set_config('ANDROID_NDK_MAJOR_VERSION', ndk_major_version)
@depends(ndk_version)
def ndk_minor_version(ndk_version):
if not ndk_version:
# Building 'js/src' for non-Android.
return
(major, minor, revision) = ndk_version.split('.')
if minor:
return minor
die('Unexpected NDK version string: ' + ndk_version)
set_config('ANDROID_NDK_MINOR_VERSION', ndk_minor_version)
set_config('ANDROID_NDK_MAJOR_VERSION', ndk_version.major)
set_config('ANDROID_NDK_MINOR_VERSION', ndk_version.minor)
@depends(target, android_version, ndk)