p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add LOCAL_NO_PIC to disable position-independent code" am: ce5900a6e0 am: 1eba5a69eb 

am: 21e59ee2bd

Change-Id: I389463c848da427fdefeae8f3119ed73e2818d4b
This commit is contained in:
Alexey Polyudov 2016-08-02 22:23:52 +00:00 committed by android-build-merger
parent 8bc67a836b 21e59ee2bd
commit f68d4fe7de
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/binary.mk
View File

@ -220,6 +220,7 @@ endif
# MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because
# all code is position independent, and then those warnings get promoted to
# errors.
ifneq ($(LOCAL_NO_PIC),true)
ifneq ($($(my_prefix)OS),windows)
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
my_cflags += -fpie
@ -227,6 +228,7 @@ else
my_cflags += -fPIC
endif
endif
endif
ifdef LOCAL_IS_HOST_MODULE
my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) $(LOCAL_SRC_FILES_$($(my_prefix)OS)_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

1
core/clear_vars.mk
View File

@ -146,6 +146,7 @@ LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
LOCAL_VTSC_FLAGS:=
LOCAL_NO_CRT:=
LOCAL_NO_LIBGCC:=
LOCAL_NO_PIC:=
LOCAL_PROPRIETARY_MODULE:=
LOCAL_OEM_MODULE:=
LOCAL_ODM_MODULE:=