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

Commit 57ddcb1b authored by Ying Wang's avatar Ying Wang
Browse files

Support to build executables against the NDK 

Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.

Bug: 7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b
parent d73053a8

core/binary.mk

+0 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ ifdef LOCAL_SDK_VERSION 
  ifdef LOCAL_IS_HOST_MODULE

    $(error $(LOCAL_PATH): LOCAL_SDK_VERSION cannot be used in host module)

  endif

  ifneq ($(filter-out SHARED_LIBRARIES STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)),)

    $(error $(LOCAL_PATH): NDK can only be used to build target shared/static libraries, \

          while your module is of class $(LOCAL_MODULE_CLASS))

  endif

  my_ndk_source_root := $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources

  my_ndk_version_root := $(HISTORICAL_NDK_VERSIONS_ROOT)/current/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)

core/combo/TARGET_linux-arm.mk

+12 −12
Original line number Diff line number Diff line
@@ -276,10 +276,10 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

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

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

	$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
@@ -287,20 +287,20 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_FDO_LIB) \

	$(TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef



define transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \

	-Wl,--gc-sections \

	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_STATIC_O)) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \
@@ -310,8 +310,8 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ 
	-Wl,--start-group \

	$(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \

	$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \

	$(TARGET_FDO_LIB) \

	$(TARGET_LIBGCC) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	-Wl,--end-group \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef

core/combo/TARGET_linux-mips.mk

+12 −12
Original line number Diff line number Diff line
@@ -248,36 +248,36 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic \ 
	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

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

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(PRIVATE_ALL_OBJECTS) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_FDO_LIB) \

	$(TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef



define transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \

	-Wl,--gc-sections \

	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_STATIC_O)) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	$(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \

	-Wl,--start-group \

	$(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \

	$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \

	$(TARGET_FDO_LIB) \

	$(TARGET_LIBGCC) \

	$(PRIVATE_TARGET_FDO_LIB) \

	$(PRIVATE_TARGET_LIBGCC) \

	-Wl,--end-group \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef

core/combo/TARGET_linux-x86.mk

+10 −10
Original line number Diff line number Diff line
@@ -191,16 +191,16 @@ endef 


define transform-o-to-executable-inner

$(hide) $(PRIVATE_CXX) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	-nostdlib -Bdynamic \

	-Wl,-dynamic-linker,/system/bin/linker \

	-Wl,-z,nocopyreloc \

	-fPIE -pie \

	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

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

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

	$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
@@ -209,17 +209,17 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef



define transform-o-to-static-executable-inner

$(hide) $(PRIVATE_CXX) \

	$(TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	-nostdlib -Bstatic \

	-o $@ \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_STATIC_O)) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \
@@ -227,9 +227,9 @@ $(hide) $(PRIVATE_CXX) \ 
	-Wl,--no-whole-archive \

	-Wl,--start-group \

	$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

	$(TARGET_LIBGCC) \

	$(PRIVATE_TARGET_LIBGCC) \

	-Wl,--end-group \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O))

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef



# Special check for x86 NDK ABI compatibility.

core/definitions.mk

+2 −4
Original line number Diff line number Diff line
@@ -1259,13 +1259,11 @@ endef 
ifneq ($(TARGET_CUSTOM_LD_COMMAND),true)

define transform-o-to-executable-inner

$(hide) $(PRIVATE_CXX) \

	$(TARGET_GLOBAL_LDFLAGS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath,\$$ORIGIN/../lib \

	$(PRIVATE_LDFLAGS) \

	$(TARGET_GLOBAL_LD_DIRS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

	$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \