Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c22ba37a authored by Ivan Lozano's avatar Ivan Lozano Committed by android-build-merger
Browse files

Merge "Disable AArch64 XOM when not using lld." am: 67505329

am: 21ad45df

Change-Id: I1ee7245b7b869df3d92bd0e45f041a5a05a54970
parents 1e8a05af 21ad45df
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -91,11 +91,13 @@ ifeq ($(strip $(ENABLE_XOM)),true)

    ifeq ($(strip $(my_xom)),true)
      ifeq (arm64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
        ifeq ($(my_use_clang_lld),true)
          my_ldflags += -Wl,-execute-only
        endif
      endif
    endif
  endif
endif

my_allow_undefined_symbols := $(strip $(LOCAL_ALLOW_UNDEFINED_SYMBOLS))
ifdef SANITIZE_HOST