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

Commit e69f15c9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'basic_vndk' 

* changes:
  Prohibit host modules from using LOCAL_COPY_HEADERS
  Add basic VNDK support in Make
  Remove GLOBAL_LD_DIRS
parents 31543713 6e51ef61

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/sdcard) 
$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/previous_overlays.txt)

$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/current_packages.txt)



$(call add-clean-step, rm -rf $(HOST_OUT_INTERMEDIATES)/include)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/base_rules.mk

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ else 
  my_host_cross :=

endif



include $(BUILD_SYSTEM)/local_vndk.mk



my_module_tags := $(LOCAL_MODULE_TAGS)

ifeq ($(my_host_cross),true)

  my_module_tags :=

core/binary.mk

+43 −23
Original line number Diff line number Diff line
@@ -74,8 +74,9 @@ endif 
my_ndk_sysroot :=

my_ndk_sysroot_include :=

my_ndk_sysroot_lib :=

ifdef LOCAL_SDK_VERSION

ifneq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),)

  ifdef LOCAL_IS_HOST_MODULE

    # LOCAL_USE_VNDK is checked in local_vndk.mk

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

  endif
@@ -104,9 +105,13 @@ ifdef LOCAL_SDK_VERSION 
  # missing API levels to existing ones where necessary, but we're not doing

  # that for the generated libraries. Clip the API level to the minimum where

  # appropriate.

  ifdef LOCAL_USE_VNDK

    my_ndk_api := $(BOARD_VNDK_VERSION)

  else

    my_ndk_api := $(LOCAL_SDK_VERSION)

  endif

  ifneq ($(my_ndk_api),current)

      my_ndk_api := $(call math_max,$(LOCAL_SDK_VERSION),$(my_min_sdk_version))

      my_ndk_api := $(call math_max,$(my_ndk_api),$(my_min_sdk_version))

  endif



  my_ndk_api_def := $(my_ndk_api)
@@ -154,6 +159,7 @@ ifdef LOCAL_SDK_VERSION 
  my_built_ndk_libs := $(my_ndk_platform_dir)/usr/$(my_ndk_libdir_name)

  my_ndk_sysroot_lib := $(my_ndk_sysroot)/usr/$(my_ndk_libdir_name)



  ifndef LOCAL_USE_VNDK

    # The bionic linker now has support for packed relocations and gnu style

    # hashes (which are much faster!), but shipping to older devices requires

    # the old style hash. Fortunately, we can build with both and it'll work
@@ -166,6 +172,7 @@ ifdef LOCAL_SDK_VERSION 


    # We don't want to expose the relocation packer to the NDK just yet.

    LOCAL_PACK_MODULE_RELOCATIONS := false

  endif



  # Set up the NDK stl variant. Starting from NDK-r5 the c++ stl resides in a separate location.

  # See ndk/docs/CPLUSPLUS-SUPPORT.html
@@ -173,6 +180,7 @@ ifdef LOCAL_SDK_VERSION 
  my_ndk_stl_shared_lib_fullpath :=

  my_ndk_stl_static_lib :=

  my_ndk_cpp_std_version :=

  ifndef LOCAL_USE_VNDK

  my_cpu_variant := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)

  ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT))

    my_cpu_variant := mips32r6
@@ -261,6 +269,7 @@ ifdef LOCAL_SDK_VERSION 
  endif

  endif

  endif

endif



ifndef LOCAL_IS_HOST_MODULE

# For device libraries, move LOCAL_LDLIBS references to my_shared_libraries. We
@@ -280,7 +289,7 @@ my_shared_libraries += $(patsubst -l%,lib%,$(filter-out $(my_allowed_ldlibs),$(m 
my_ldlibs := $(filter $(my_allowed_ldlibs),$(my_ldlibs))

endif



ifdef LOCAL_SDK_VERSION

ifneq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),)

  my_all_ndk_libraries := \

      $(NDK_MIGRATED_LIBS) $(addprefix lib,$(NDK_PREBUILT_SHARED_LIBRARIES))

  my_ndk_shared_libraries := \
@@ -489,17 +498,30 @@ my_asflags += -D__ASSEMBLY__ 
## Define PRIVATE_ variables from global vars

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

ifndef LOCAL_IS_HOST_MODULE

ifdef LOCAL_SDK_VERSION

ifdef LOCAL_USE_VNDK

my_target_global_c_includes := \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_INCLUDES)

my_target_global_c_system_includes := \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_SYSTEM_INCLUDES) \

    $(my_ndk_sysroot_include)

else ifdef LOCAL_SDK_VERSION

my_target_global_c_includes :=

my_target_global_c_system_includes := $(my_ndk_stl_include_path) $(my_ndk_sysroot_include)

else

else ifdef BOARD_VNDK_VERSION

my_target_global_c_includes := $(SRC_HEADERS) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)

my_target_global_c_system_includes := $(SRC_SYSTEM_HEADERS) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_SYSTEM_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_SYSTEM_INCLUDES)

endif # LOCAL_SDK_VERSION

else

my_target_global_c_includes := $(SRC_HEADERS) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)

my_target_global_c_system_includes := $(SRC_SYSTEM_HEADERS) $(TARGET_OUT_HEADERS) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_SYSTEM_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_SYSTEM_INCLUDES)

endif



ifeq ($(my_clang),true)

my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_$(my_prefix)GLOBAL_CFLAGS)
@@ -523,10 +545,8 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_glob 
else # LOCAL_IS_HOST_MODULE



my_host_global_c_includes := $(SRC_HEADERS) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_INCLUDES)

my_host_global_c_system_includes := $(SRC_SYSTEM_HEADERS) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)PROJECT_SYSTEM_INCLUDES) \

    $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)C_SYSTEM_INCLUDES)



ifeq ($(my_clang),true)
@@ -1339,7 +1359,7 @@ endif 
## they may cusomize their install path with LOCAL_MODULE_PATH

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

# Get the list of INSTALLED libraries as module names.

ifdef LOCAL_SDK_VERSION

ifneq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),)

  installed_shared_library_module_names := \

      $(my_shared_libraries)

else
@@ -1508,7 +1528,7 @@ ALL_C_CPP_ETC_OBJECTS += $(all_objects) 
so_suffix := $($(my_prefix)SHLIB_SUFFIX)

a_suffix := $($(my_prefix)STATIC_LIB_SUFFIX)



ifdef LOCAL_SDK_VERSION

ifneq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),)

built_shared_libraries := \

    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

      $(addsuffix $(so_suffix), \
@@ -1690,7 +1710,7 @@ my_ldflags := $(filter-out -l%,$(my_ldlib_flags)) 
# One last verification check for ldlibs

ifndef LOCAL_IS_HOST_MODULE

my_allowed_ldlibs :=

ifdef LOCAL_SDK_VERSION

ifneq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),)

  my_allowed_ldlibs := $(addprefix -l,$(NDK_PREBUILT_SHARED_LIBRARIES))

endif

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ LOCAL_NDK_VERSION:=current 
LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES:=

LOCAL_LOGTAGS_FILES:=

LOCAL_RECORDED_MODULE_TYPE:=

LOCAL_USE_VNDK:=



# arch specific variables

LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/config.mk

+1 −18
Original line number Diff line number Diff line
@@ -684,10 +684,8 @@ else 
RELATIVE_PWD :=

endif



HOST_PROJECT_INCLUDES :=

HOST_PROJECT_SYSTEM_INCLUDES := $(HOST_OUT_HEADERS)

TARGET_PROJECT_INCLUDES :=

TARGET_PROJECT_SYSTEM_INCLUDES := $(TARGET_OUT_HEADERS) \

TARGET_PROJECT_SYSTEM_INCLUDES := \

		$(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) \

		$(TARGET_PRODUCT_KERNEL_HEADERS)
@@ -696,21 +694,6 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_INCLUDES := $(TARGET_PROJECT_INCLUDE 
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_SYSTEM_INCLUDES := $(TARGET_PROJECT_SYSTEM_INCLUDES)

endif



ifdef HOST_2ND_ARCH

$(HOST_2ND_ARCH_VAR_PREFIX)HOST_PROJECT_INCLUDES := $(HOST_PROJECT_INCLUDES)

$(HOST_2ND_ARCH_VAR_PREFIX)HOST_PROJECT_SYSTEM_INCLUDES := $(HOST_PROJECT_SYSTEM_INCLUDES)

endif



ifdef HOST_CROSS_OS

HOST_CROSS_PROJECT_INCLUDES :=

HOST_CROSS_PROJECT_SYSTEM_INCLUDES := $(HOST_CROSS_OUT_HEADERS)



ifdef HOST_CROSS_2ND_ARCH

$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_PROJECT_INCLUDES:= $(HOST_CROSS_PROJECT_INCLUDES)

$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_PROJECT_SYSTEM_INCLUDES:= $(HOST_CROSS_PROJECT_SYSTEM_INCLUDES)

endif

endif



# allow overriding default Java libraries on a per-target basis

ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)

  TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart core-junit ext framework okhttp