From 0ba31a494d00ed6270b7fb71d3f1864925a02c57 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Mon, 22 Nov 2021 18:57:01 +0200 Subject: [PATCH] android.mk: Add missing variables to the make target Android build system may use different internal variables to specify cflags/cppflags. Small change in product confguration may force Android to use diffrent set of variables, therefore we should keep all of them attached to the make rule's target. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5549 Fixes: 8621bd8d5e67 ("android: Add scripts to build using meson") Signed-off-by: Roman Stratiienko Acked-by: Jesse Natalie Reviewed-by: Marijn Suijten Part-of: (cherry picked from commit 32ec0fffa6fbe58b0fd76901c6a7dc8a9cfc79b1) --- .pick_status.json | 2 +- android/mesa3d_cross.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 690017f5f43..7d143b521ea 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1201,7 +1201,7 @@ "description": "android.mk: Add missing variables to the make target", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "8621bd8d5e67173281c6a6dd64054d4b0366f023" }, diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index fcb4d938f42..3e0622159fe 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -128,7 +128,6 @@ $(MESON_GEN_FILES_TARGET): PRIVATE_C_INCLUDES := $(my_c_includes) $(MESON_GEN_FILES_TARGET): PRIVATE_IMPORTED_INCLUDES := $(imported_includes) $(MESON_GEN_FILES_TARGET): PRIVATE_LDFLAGS := $(my_ldflags) $(MESON_GEN_FILES_TARGET): PRIVATE_LDLIBS := $(my_ldlibs) -$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags) $(MESON_GEN_FILES_TARGET): PRIVATE_TIDY_CHECKS := $(my_tidy_checks) $(MESON_GEN_FILES_TARGET): PRIVATE_TIDY_FLAGS := $(my_tidy_flags) $(MESON_GEN_FILES_TARGET): PRIVATE_ARFLAGS := $(my_arflags) @@ -139,6 +138,11 @@ $(MESON_GEN_FILES_TARGET): PRIVATE_ALL_OBJECTS := $(strip $(all_objects)) $(MESON_GEN_FILES_TARGET): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CFLAGS := $(my_target_global_cflags) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CONLYFLAGS := $(my_target_global_conlyflags) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags) + $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins) $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic) $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o)