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

Commit fbb8b629 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 746d1f73: am 9e21bcdc: Merge "Support to build executables for TARGET_2ND_ARCH" 

* commit '746d1f73':
  Support to build executables for TARGET_2ND_ARCH
parents 443c9dc8 746d1f73

core/clear_vars.mk

+2 −1
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ LOCAL_DIST_BUNDLED_BINARIES:= 
LOCAL_HAL_STATIC_LIBRARIES:=

LOCAL_NO_SYNTAX_CHECK:=

LOCAL_NO_STATIC_ANALYZER:=

LOCAL_2ND_ARCH_VAR_PREFIX:=

LOCAL_32BIT_ONLY:= # '',true

LOCAL_NO_2ND_ARCH:= # '',true



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ endif 
define transform-o-to-executable

@mkdir -p $(dir $@)

@echo "target Executable: $(PRIVATE_MODULE) ($@)"

$(transform-o-to-executable-inner)

$($(PRIVATE_2ND_ARCH_VAR_PREFIX)transform-o-to-executable-inner)

endef
@@ -1342,7 +1342,7 @@ endif 
define transform-o-to-static-executable

@mkdir -p $(dir $@)

@echo "target StaticExecutable: $(PRIVATE_MODULE) ($@)"

$(transform-o-to-static-executable-inner)

$($(PRIVATE_2ND_ARCH_VAR_PREFIX)transform-o-to-static-executable-inner)

endef

core/envsetup.mk

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ TARGET_2ND_ARCH_MODULE_SUFFIX := _32 
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(TARGET_OUT)/lib

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)



TARGET_OUT_DATA := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_DATA)

TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)

core/executable.mk

+9 −65
Original line number Diff line number Diff line 
###########################################################

## Standard rules for building an executable file.

##

## Additional inputs from base_rules.make:

## None.

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

# We don't automatically set up rules to build executables for both

# TARGET_ARCH and TARGET_2ND_ARCH.

# By default, an executable is built for TARGET_ARCH.

# To build it for TARGET_2ND_ARCH in a 64bit product, use "LOCAL_32BIT_ONLY := true".



ifeq ($(strip $(LOCAL_MODULE_CLASS)),)

LOCAL_MODULE_CLASS := EXECUTABLES

endif

ifeq ($(strip $(LOCAL_MODULE_SUFFIX)),)

LOCAL_MODULE_SUFFIX := $(TARGET_EXECUTABLE_SUFFIX)

endif



$(call target-executable-hook)



skip_build_from_source :=

ifdef LOCAL_PREBUILT_MODULE_FILE

ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))

include $(BUILD_PREBUILT)

skip_build_from_source := true

endif

endif



ifndef skip_build_from_source



include $(BUILD_SYSTEM)/dynamic_binary.mk



# Define PRIVATE_ variables from global vars

my_target_global_ld_dirs := $(TARGET_GLOBAL_LD_DIRS)

ifeq ($(LOCAL_CLANG),true)

my_target_global_ldflags := $(CLANG_TARGET_GLOBAL_LDFLAGS)

else

my_target_global_ldflags := $(TARGET_GLOBAL_LDFLAGS)

endif

my_target_fdo_lib := $(TARGET_FDO_LIB)

my_target_libgcc := $(TARGET_LIBGCC)

my_target_crtbegin_dynamic_o := $(TARGET_CRTBEGIN_DYNAMIC_O)

my_target_crtbegin_static_o := $(TARGET_CRTBEGIN_STATIC_O)

my_target_crtend_o := $(TARGET_CRTEND_O)

ifdef LOCAL_SDK_VERSION

# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,

# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree.

my_target_global_ld_dirs := \

    $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \

    $(my_ndk_version_root)/usr/lib) \

    $(my_target_global_ld_dirs)

my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags)

my_target_crtbegin_dynamic_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_dynamic.o)

my_target_crtbegin_static_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_static.o)

my_target_crtend_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtend_android.o)

endif

$(linked_module): PRIVATE_TARGET_GLOBAL_LD_DIRS := $(my_target_global_ld_dirs)

$(linked_module): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags)

$(linked_module): PRIVATE_TARGET_FDO_LIB := $(my_target_fdo_lib)

$(linked_module): PRIVATE_TARGET_LIBGCC := $(my_target_libgcc)

$(linked_module): PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O := $(my_target_crtbegin_dynamic_o)

$(linked_module): PRIVATE_TARGET_CRTBEGIN_STATIC_O := $(my_target_crtbegin_static_o)

$(linked_module): PRIVATE_TARGET_CRTEND_O := $(my_target_crtend_o)



ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)

$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o)

	$(transform-o-to-static-executable)

ifeq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true)

LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX)

else

$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o)

	$(transform-o-to-executable)

LOCAL_2ND_ARCH_VAR_PREFIX :=

endif



endif  # skip_build_from_source
 
include $(BUILD_SYSTEM)/executable_internal.mk

LOCAL_2ND_ARCH_VAR_PREFIX :=

core/executable_internal.mk

0 → 100644
+69 −0
Original line number Diff line number Diff line 
###########################################################

## Standard rules for building an executable file.

##

## Additional inputs from base_rules.make:

## None.

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



ifeq ($(strip $(LOCAL_MODULE_CLASS)),)

LOCAL_MODULE_CLASS := EXECUTABLES

endif

ifeq ($(strip $(LOCAL_MODULE_SUFFIX)),)

LOCAL_MODULE_SUFFIX := $(TARGET_EXECUTABLE_SUFFIX)

endif



$(call target-executable-hook)



skip_build_from_source :=

ifdef LOCAL_PREBUILT_MODULE_FILE

ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))

include $(BUILD_PREBUILT)

skip_build_from_source := true

endif

endif



ifndef skip_build_from_source



include $(BUILD_SYSTEM)/dynamic_binary.mk



# Define PRIVATE_ variables from global vars

my_target_global_ld_dirs := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LD_DIRS)

ifeq ($(LOCAL_CLANG),true)

my_target_global_ldflags := $(CLANG_TARGET_GLOBAL_LDFLAGS)

else

my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LDFLAGS)

endif

my_target_fdo_lib := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_LIB)

my_target_libgcc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBGCC)

my_target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_DYNAMIC_O)

my_target_crtbegin_static_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_STATIC_O)

my_target_crtend_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTEND_O)

ifdef LOCAL_SDK_VERSION

# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,

# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree.

my_target_global_ld_dirs := \

    $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \

    $(my_ndk_version_root)/usr/lib) \

    $(my_target_global_ld_dirs)

my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags)

my_target_crtbegin_dynamic_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_dynamic.o)

my_target_crtbegin_static_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_static.o)

my_target_crtend_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtend_android.o)

endif

$(linked_module): PRIVATE_TARGET_GLOBAL_LD_DIRS := $(my_target_global_ld_dirs)

$(linked_module): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags)

$(linked_module): PRIVATE_TARGET_FDO_LIB := $(my_target_fdo_lib)

$(linked_module): PRIVATE_TARGET_LIBGCC := $(my_target_libgcc)

$(linked_module): PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O := $(my_target_crtbegin_dynamic_o)

$(linked_module): PRIVATE_TARGET_CRTBEGIN_STATIC_O := $(my_target_crtbegin_static_o)

$(linked_module): PRIVATE_TARGET_CRTEND_O := $(my_target_crtend_o)



ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)

$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o)

	$(transform-o-to-static-executable)

else

$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o)

	$(transform-o-to-executable)

endif



endif  # skip_build_from_source