Merge "Add LOCAL_NO_PIC to disable position-independent code"
This commit is contained in:
commit
ce5900a6e0
2 changed files with 3 additions and 0 deletions
|
@ -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))
|
||||
|
|
|
@ -143,6 +143,7 @@ LOCAL_PROTOC_FLAGS:=
|
|||
LOCAL_PROTO_JAVA_OUTPUT_PARAMS:=
|
||||
LOCAL_NO_CRT:=
|
||||
LOCAL_NO_LIBGCC:=
|
||||
LOCAL_NO_PIC:=
|
||||
LOCAL_PROPRIETARY_MODULE:=
|
||||
LOCAL_OEM_MODULE:=
|
||||
LOCAL_ODM_MODULE:=
|
||||
|
|
Loading…
Reference in a new issue