mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
f16d77b0a2
In certain configurations, in particular when installing the Android SDK
using HomeBrew, one sees a configuration with symlinks like:
[brian@brian-macbook git]$ ls -l /usr/local/Cellar/android-sdk/23.0.2/
total 72
...
lrwxr-xr-x 1 brian admin 38 Nov 14 16:39 platforms -> ../../../var/lib/android-sdk/platforms
...
drwxr-xr-x 26 brian admin 884 Nov 14 17:43 tools
In this case, we have
ANDROID_SDK=/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21.
It is an anti-pattern to use ANDORID_SDK/.. to find other paths in the
tree. This pattern is used in at least two places:
1) When we try to find
/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21/../../tools,
we end up in the /usr/local/var/lib subtree. This patch works around
that by exporting and using ANDROID_TOOLS; ANDROID_TOOLS itself is
extracted using path matching, rather than following .. through the
filesystem.
2) We also need to use ANDROID_SDK_ROOT rather than
ANDROID_SDK/../.. through-out.
--HG--
extra : rebase_source : 5e0323a94f2b80550f17a624e16f338cdeec406d
|
||
|---|---|---|
| .. | ||
| acwinpaths.m4 | ||
| altoptions.m4 | ||
| android.m4 | ||
| arch.m4 | ||
| clang-plugin.m4 | ||
| clean-config.sh | ||
| codeset.m4 | ||
| compiler-opts.m4 | ||
| config.guess | ||
| config.status.m4 | ||
| config.sub | ||
| expandlibs.m4 | ||
| ffi.m4 | ||
| frameptr.m4 | ||
| gcc-pr39608.m4 | ||
| gcc-pr49911.m4 | ||
| hooks.m4 | ||
| hotfixes.m4 | ||
| icu.m4 | ||
| install-sh | ||
| linux.m4 | ||
| llvm-pr8927.m4 | ||
| lto.m4 | ||
| mozcommonheader.m4 | ||
| mozheader.m4 | ||
| mozprog.m4 | ||
| nspr-build.m4 | ||
| nspr.m4 | ||
| nss.m4 | ||
| pkg.m4 | ||
| python-virtualenv.m4 | ||
| subconfigure.m4 | ||
| toolchain.m4 | ||
| winsdk.m4 | ||
| wrapper.m4 | ||
| zlib.m4 | ||