diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index ddb29151df3..a5245092334 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -152,6 +152,9 @@ $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_ $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic) $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o) $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_CRTEND_SO_O := $(my_target_crtend_so_o) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_TRIPLE := $(my_target_triple) +# Rust has a different name for armv7 +$(MESON_GEN_FILES_TARGET): PRIVATE_RUST_TARGET_TRIPLE := $(subst armv7a-,armv7-,$(my_target_triple)) ## define m-lld-flags @@ -250,11 +253,14 @@ $(MESON_GEN_FILES_TARGET): $(sort $(shell find -L $(MESA3D_TOP) -not -path '*/\. $(foreach inc,$(nospace-includes),'$(call abs-include,$(inc))', )'']\n" \ "c_link_args = [$(foreach flag, $(m-lld-flags-cleaned),'$(flag)',)'']\n" \ "cpp_link_args = [$(foreach flag, $(m-lld-flags-cleaned),'$(flag)',)'']\n" \ + "bindgen_clang_arguments = ['-target', '$(PRIVATE_TARGET_TRIPLE)']\n" \ "needs_exe_wrapper = true\n" \ + "skip_sanity_check = true\n" \ "[binaries]\n" \ "ar = '$(AOSP_ABSOLUTE_PATH)/$($($(M_TARGET_PREFIX))TARGET_AR)'\n" \ "c = [$(foreach arg,$(PRIVATE_CC),'$(subst prebuilts/,$(AOSP_ABSOLUTE_PATH)/prebuilts/,$(arg))',)'']\n" \ "cpp = [$(foreach arg,$(PRIVATE_CXX),'$(subst prebuilts/,$(AOSP_ABSOLUTE_PATH)/prebuilts/,$(arg))',)'']\n" \ + "rust = ['rustc', '--target', '$(PRIVATE_RUST_TARGET_TRIPLE)', '-C', 'link-args=-target $(PRIVATE_RUST_TARGET_TRIPLE) -lc']\n" \ "c_ld = 'lld'\n" \ "cpp_ld = 'lld'\n\n" \ "pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=' + '$(call relative-to-absolute,$(MESON_GEN_DIR))', '/usr/bin/pkg-config']\n\n" \