[Mesa-dev] [PATCH v3 33/34] dri drivers: Always add the sha1 build-id

[Emil Velikov]

On 22 October 2017 at 21:01, Jordan Justen <jordan.l.justen at intel.com> wrote:
> Cc: Dylan Baker <dylanx.c.baker at intel.com>
> Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
> ---
>  src/mesa/drivers/dri/Makefile.am | 1 +
>  src/mesa/drivers/dri/meson.build | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> 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)
Please squash something like the following [untested] hunk.
With that the patch is
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

I believe that should do it for Android - RobH, Tapani feel free to correct me.
-Emil

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/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)