From b448834e962e185ffb09d8a00ee92b79216dd176 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Wed, 27 Jun 2018 10:55:20 -0700 Subject: [PATCH] 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 --- core/definitions.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 873ec7f71..fab5e42aa 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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)