dri drivers: Always add the sha1 build-id

v4:
 * Add Android build changes. (Emil)

Cc: Dylan Baker <dylanx.c.baker@intel.com>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

Android.mk

@@ -39,6 +39,7 @@ endif
 MESA_DRI_MODULE_REL_PATH := dri
 MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH)
 MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH)
+MESA_DRI_LDFLAGS := -Wl,--build-id=sha1
 
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python

src/mesa/drivers/dri/Makefile.am

@@ -57,6 +57,7 @@ mesa_dri_drivers_la_LDFLAGS = \
 	-module \
 	-no-undefined \
 	-avoid-version \
+	-Wl,--build-id=sha1 \
 	$(BSYMBOLIC) \
 	$(GC_SECTIONS) \
 	$(LD_NO_UNDEFINED)

src/mesa/drivers/dri/i915/Android.mk

@@ -27,6 +27,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := i915_dri
 LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
+LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS)
 
 # Import variables i915_FILES.
 include $(LOCAL_PATH)/Makefile.sources

src/mesa/drivers/dri/i965/Android.mk

@@ -247,6 +247,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := i965_dri
 LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
+LOCAL_LDFLAGS += $(MESA_DRI_LDFLAGS)
 
 LOCAL_CFLAGS := \
 	$(MESA_DRI_CFLAGS)

src/mesa/drivers/dri/meson.build

@@ -50,7 +50,7 @@ if dri_drivers != []
                  libmesa_util, libnir, libmesa_classic],
     dependencies : [dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread,
                     dep_dl],
-    link_args : [ld_args_bsymbolic, ld_args_gc_sections],
+    link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
   )
 
   pkg.generate(