diff options
| author | Mike Frysinger <vapier@google.com> | 2015-10-02 16:25:01 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2015-10-02 16:35:54 -0400 |
| commit | efc3ab08c431357db6c58249ce1a5b4ae190a512 (patch) | |
| tree | 69529dff299153f25cde135445f7e1765fd068a6 | |
| parent | 264816f74e0a48a81ff2408e815a0d5e99985bc1 (diff) | |
| download | portage-efc3ab08c431357db6c58249ce1a5b4ae190a512.tar.gz | |
ebuild: pass through android variables
Android exports a bunch of env vars to set the location of source code.
Make sure we pass those down as the 3rd party compiler relies on it.
BUG=24614250
TEST=building packages works w/out errors
Change-Id: Ib0e1741626b9ad25a49ef2c8abf7494e2efc8a27
| -rw-r--r-- | usr/lib/portage/pym/portage/package/ebuild/config.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/lib/portage/pym/portage/package/ebuild/config.py b/usr/lib/portage/pym/portage/package/ebuild/config.py index b75d28c..f3633ed 100644 --- a/usr/lib/portage/pym/portage/package/ebuild/config.py +++ b/usr/lib/portage/pym/portage/package/ebuild/config.py @@ -383,6 +383,10 @@ class config(object): env_d = getconfig(os.path.join(eroot, "etc", "profile.env"), tolerant=tolerant, expand=False) or {} expand_map = env_d.copy() + + # Hack in some env vars. + # https://bugs.gentoo.org/492854 + expand_map.update(dict((k, v) for k, v in os.environ.items() if k.startswith('ANDROID_'))) self._expand_map = expand_map # Allow make.globals to set default paths relative to ${EPREFIX}. |