summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Justen <[email protected]>2017-10-18 15:04:37 -0700
committerJordan Justen <[email protected]>2017-10-31 23:36:54 -0700
commitccb700526f647e0d02cb1c500b6aee083ba1b9d7 (patch)
treed128f82c0a81fb181289697b4e8239f9aff13c6f
parente5b141634cff3aa1f68699f39a2c3794261a32b1 (diff)
dri drivers: Always add the sha1 build-id
v4: * Add Android build changes. (Emil) Cc: Dylan Baker <[email protected]> Signed-off-by: Jordan Justen <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--Android.mk1
-rw-r--r--src/mesa/drivers/dri/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/i915/Android.mk1
-rw-r--r--src/mesa/drivers/dri/i965/Android.mk1
-rw-r--r--src/mesa/drivers/dri/meson.build2
5 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 72a9b04be1e..914854c27d6 100644
--- 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 95c637d0cdd..5cb2127501e 100644
--- 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 62d388e08df..b1054aa6e28 100644
--- 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 d75ffb13813..39aa33fa9f6 100644
--- 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 ee1a1d95a64..a2fc8db8ada 100644
--- 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(