diff --git a/docs/android.rst b/docs/android.rst index 17cc2602514..05006649f1f 100644 --- a/docs/android.rst +++ b/docs/android.rst @@ -8,14 +8,14 @@ Android NDK. The Android.mk build system has proven to be hard to maintain, as one needs a built Android tree to build against, and it has never been -tested in CI. The meson build system flow is frequently used by +tested in CI. The Meson build system flow is frequently used by Chrome OS developers for building and testing Android drivers. Building using the Android NDK ------------------------------ Download and install the NDK using whatever method you normally would. -Then, create your meson cross file to use it, something like this +Then, create your Meson cross file to use it, something like this ``~/.local/share/meson/cross/android-aarch64`` file:: [binaries] @@ -25,7 +25,7 @@ Then, create your meson cross file to use it, something like this c_ld = 'lld' cpp_ld = 'lld' strip = 'NDKDIR/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip' - # Android doesn't come with a pkg-config, but we need one for meson to be happy not + # Android doesn't come with a pkg-config, but we need one for Meson to be happy not # finding all the optional deps it looks for. Use system pkg-config pointing at a # directory we get to populate with any .pc files we want to add for Android pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=NDKDIR/pkgconfig', '/usr/bin/pkg-config'] diff --git a/docs/drivers/panfrost.rst b/docs/drivers/panfrost.rst index 3a1d44246b6..3b00e762bbc 100644 --- a/docs/drivers/panfrost.rst +++ b/docs/drivers/panfrost.rst @@ -70,7 +70,7 @@ Although Mali hardware is usually paired with an Arm CPU, Panfrost is portable C code and should work on any Linux machine. In particular, you can test the compiler on shader-db on an Intel desktop. -To build Mesa with Panfrost drm-shim, configure meson with +To build Mesa with Panfrost drm-shim, configure Meson with ``-Dgallium-drivers=panfrost`` and ``-Dtools=drm-shim``. See the above building section for a full invocation. The drm-shim binary will be built to ``build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so``.