diff options
| author | Roman Stratiienko <r.stratiienko@gmail.com> | 2020-07-15 22:26:44 +0300 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-07-15 20:49:24 +0000 |
| commit | 29849aca0fed3dc4fb3fa9941a251c86bd3713f9 (patch) | |
| tree | f41c65970aca59175a02eec58d0f834f27c777e9 /Android.mk | |
| parent | 2adb13f187fa02970a6c6a8cd60368a91a3e182b (diff) | |
Android: Fixes for Q and R
Fix Android-Q build:
- Use AOSP prebuilt bison by specifying $(BISON) variable
- Use AOSP prebuilt flex by specifying $(LEX) variable
Fix Android-R build:
- Add M4 environmet variable for Android R and higher (See [1])
[1] - https://cs.android.com/android/_/android/platform/build/+/2bfffb9f48a78de12faf5da77424c0cecb70d6eb:Changes.md;dlc=997661002af1282d938e88c3c723037e42e5d283
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Tested-by: Mauro Rossi <issor.oruam@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5894>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index c15c2b78bac..6181bbe8f31 100644 --- a/Android.mk +++ b/Android.mk @@ -44,6 +44,11 @@ MESA_DRI_LDFLAGS := -Wl,--build-id=sha1 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk MESA_PYTHON2 := python MESA_PYTHON3 := python3 +ifeq ($(filter 5 6 7 8 9 10, $(MESA_ANDROID_MAJOR_VERSION)),) +MESA_LEX := M4=$(M4) $(LEX) +else +MESA_LEX := $(LEX) +endif # Lists to convert driver names to boolean variables # in form of <driver name>.<boolean make variable> |