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

Commit b448834e authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar
Browse files

Do not set entry-point for Windows

Bug: http://b/62424007

This breaks 64-bit Windows executables.  Probably due to the Clang
migration, the entry-point need not be set even for 32-bit executables.

Test: 32-bit and 64-bit aapt2_tests.exe and ziparchive-tests.exe can
start.  (There are some failed tests, though).

Change-Id: I1dea9137c79c5f26b493640cfae0856c1a7ea301
parent 14add317
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -1986,10 +1986,6 @@ ifdef BUILD_HOST_static
HOST_FPIE_FLAGS :=
else
HOST_FPIE_FLAGS := -pie
# Force the correct entry point to workaround a bug in binutils that manifests with -pie
ifeq ($(HOST_CROSS_OS),windows)
HOST_CROSS_FPIE_FLAGS += -Wl,-e_mainCRTStartup
endif
endif

ifneq ($(HOST_CUSTOM_LD_COMMAND),true)