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>

diff --git a/Android.mk b/Android.mk
index 72a9b04be1e3e7aa59bf126287d5104b34ca6dd7..914854c27d633cddd850ddf1dcca3720ffe740cd 100644 (file)
--- a/Android.mk
+++ b/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

diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index 95c637d0cddb19c3d95005c82fe6c4b3d0ea5470..5cb2127501ed4705d58819bc9e9ac729be993377 100644 (file)
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/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)

diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk
index 62d388e08df5d92bb81867ec7dfb1e94ed8f359e..b1054aa6e285ecf28128cb51c4fb9556fb10bf99 100644 (file)
--- a/src/mesa/drivers/dri/i915/Android.mk
+++ b/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

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index d75ffb1381300e5375a3796999ea695584991e64..39aa33fa9f6ec8029cde563ef1ffb27c5a8063dc 100644 (file)
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/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)

diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index ee1a1d95a64edd1d134aa5a8084bab36f5d76bd8..a2fc8db8adad8ed0ba9e2b17c6c01cdb0181766a 100644 (file)
--- a/src/mesa/drivers/dri/meson.build
+++ b/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(