diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-04-04 23:39:53 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-05-26 17:06:15 +0530 |
| commit | 98dae50166486a951fcb0ac3309835017a25cecc (patch) | |
| tree | 324f566b2be98d8f3562a427a6802df1d8787c62 /config/android.config | |
| parent | 59bd06df48d0fa85c5e96b53ea528918934cd62e (diff) | |
cerbero: Refactor variant handling in platform config files
While parsing config files such as the platform config files, we were
exposing variants as an unresolved `list` of "operations" that will
enable or disable the variant once they've all been resolved
This is buggy because it means that platform config files have no way
to know whether a variant has actually been disabled or enabled by the
user.
Now we always parse variants into the `Variants` object before parsing
all configuration files.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/480>
Diffstat (limited to 'config/android.config')
| -rw-r--r-- | config/android.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/android.config b/config/android.config index c3c170f1..199c8e27 100644 --- a/config/android.config +++ b/config/android.config @@ -26,7 +26,7 @@ import cerbero.utils.messages as m # sysroot: location of the API-level libraries (no headers) # isysroot: location of the headers -variants += ['nopython', 'notestspackage'] +variants.override(['nopython', 'notestspackage']) # We don't want anything from linux system to be used on android :) allow_system_libs=False @@ -116,7 +116,7 @@ env['ANDROID_NDK'] = toolchain_prefix # so that we can construct different paths to include/lib directories to where # they actually are. Without this we don't know where the headers/libs will # actually end up -if 'universal' in variants: +if universal_archs: incl_dir = os.path.join(prefix, _cerbero_arch, 'include') lib_dir = os.path.join(prefix, _cerbero_arch, 'lib') else: |