Mesa (master): Android: move libraries to /vendor

[Rob Herring]

Module: Mesa
Branch: master
Commit: c3f75d483c72d4ceb22d32561f8d08bf3e0c8a0b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3f75d483c72d4ceb22d32561f8d08bf3e0c8a0b

Author: Rob Herring <robh at kernel.org>
Date:   Fri Sep 15 08:50:09 2017 -0500

Android: move libraries to /vendor

As part of Treble project in Android O, all the device specific files have
to be located in a separate vendor partition. This is done by setting
LOCAL_PROPRIETARY_MODULE (the name is misleading). This change will not
break existing platforms without a vendor partition as it will just move
files to /system/vendor.

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Signed-off-by: Rob Herring <robh at kernel.org>

---

 Android.common.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Android.common.mk b/Android.common.mk
index 483f6c5be2..5671c1c1a5 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -97,8 +97,9 @@ LOCAL_CFLAGS += -DHAVE_LIBDRM
 LOCAL_SHARED_LIBRARIES += libdrm
 endif
 
-LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
-LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
+LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib/$(MESA_DRI_MODULE_REL_PATH)\"
+LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
+LOCAL_PROPRIETARY_MODULE := true
 
 # uncomment to keep the debug symbols
 #LOCAL_STRIP_MODULE := false