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

Commit f8a30598 authored by Ed Heyl's avatar Ed Heyl
Browse files

resolved conflict in mergre to goog/master

Change-Id: I6ee3a8802595786a91a1bd77188648fda9dc3447
parents 2dd9902c 4c9c895a
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ $(hide) $(PRIVATE_CXX) \
	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
endef


# Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
define transform-o-to-executable-inner
$(hide) $(PRIVATE_CXX) \