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
|
||
|---|---|---|
| .. | ||
| app | ||
| base | ||
| branding | ||
| build/classycle | ||
| chrome | ||
| components | ||
| config | ||
| extensions | ||
| fonts | ||
| geckoview_library | ||
| gradle | ||
| installer | ||
| locales | ||
| modules | ||
| search | ||
| services | ||
| stumbler | ||
| tests | ||
| themes/core | ||
| thirdparty | ||
| app.mozbuild | ||
| build.mk | ||
| confvars.sh | ||
| debug_sign_tool.py | ||
| defs.mk | ||
| LICENSE | ||
| Makefile.in | ||
| moz.build | ||