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

Commit 10461b78 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Add NATIVE_TESTS class, move host native tests" 

am: e72fc639

* commit 'e72fc639':
  Add NATIVE_TESTS class, move host native tests

Change-Id: Ifb0401242afe1e6e16666001faf3d55471200c3f
parents 8a78c90a e72fc639

core/base_rules.mk

+3 −1
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ ifeq ($(my_module_path),) 
    partition_tag := _OEM

  else ifeq (true,$(LOCAL_ODM_MODULE))

    partition_tag := _ODM

  else ifeq (NATIVE_TESTS,$(LOCAL_MODULE_CLASS))

    partition_tag := _DATA

  else

    # The definition of should-install-to-system will be different depending

    # on which goal (e.g., sdk or just droid) is being built.
@@ -457,7 +459,7 @@ $(foreach tag,$(my_module_tags),\ 
## umbrella targets used to verify builds

###########################################################

j_or_n :=

ifneq (,$(filter EXECUTABLES SHARED_LIBRARIES STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)))

ifneq (,$(filter EXECUTABLES SHARED_LIBRARIES STATIC_LIBRARIES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)))

j_or_n := native

else

ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ endif 
# all code is position independent, and then those warnings get promoted to

# errors.

ifneq ($($(my_prefix)OS),windows)

ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)

ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

my_cflags += -fpie

else

my_cflags += -fPIC

core/combo/HOST_darwin-x86.mk

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ endef 


define transform-host-o-to-executable-inner

$(hide) $(PRIVATE_CXX) \

        -Wl,-rpath,@loader_path/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

        -Wl,-rpath,@loader_path/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \

        $(foreach path,$(PRIVATE_RPATHS), \

          -Wl,-rpath,@loader_path/$(path)) \

        -o $@ \

        -Wl,-headerpad_max_install_names \

        $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -1877,8 +1877,8 @@ $(hide) $(PRIVATE_CXX) \ 
	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_HOST_LIBPROFILE_RT)) \

	$(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

	-Wl,-rpath-link=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath,\$$ORIGIN/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OUT_SHARED_LIBRARIES)) \

	-Wl,-rpath,\$$ORIGIN/$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OUT_SHARED_LIBRARIES)) \

	$(foreach path,$(PRIVATE_RPATHS), \

	  -Wl,-rpath,\$$ORIGIN/$(path)) \

	$($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)GLOBAL_LD_DIRS) \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

		$(PRIVATE_HOST_GLOBAL_LDFLAGS) \

core/dynamic_binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ endif 
# Do not pack relocations for executables. Because packing results in

# non-zero p_vaddr which causes kernel to load executables to lower

# address (starting at 0x8000) http://b/20665974

ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)

ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

  my_pack_module_relocations := false

endif