Android: Fixes for Q and R
authorRoman Stratiienko <r.stratiienko@gmail.com>
Wed, 15 Jul 2020 19:26:44 +0000 (22:26 +0300)
committerMarge Bot <eric+marge@anholt.net>
Wed, 15 Jul 2020 20:49:24 +0000 (20:49 +0000)
commit29849aca0fed3dc4fb3fa9941a251c86bd3713f9
treef41c65970aca59175a02eec58d0f834f27c777e9
parent2adb13f187fa02970a6c6a8cd60368a91a3e182b
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>
Android.mk
src/compiler/Android.glsl.gen.mk
src/freedreno/Android.ir3.mk
src/mesa/program/Android.mk