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

Commit 30dda1da authored by Vic Yang's avatar Vic Yang Committed by Gerrit Code Review
Browse files

Merge changes from topic "vndk-no-vendor-variant" 

* changes:
  Add support for no-vendor-variant VNDK
  Add module-target-built-files function
parents 7e87c72f 51512c55

core/base_rules.mk

+4 −0
Original line number Diff line number Diff line
@@ -776,6 +776,10 @@ ALL_MODULES.$(my_register_name).CHECKED := \ 
    $(ALL_MODULES.$(my_register_name).CHECKED) $(my_checked_module)

ALL_MODULES.$(my_register_name).BUILT := \

    $(ALL_MODULES.$(my_register_name).BUILT) $(LOCAL_BUILT_MODULE)

ifndef LOCAL_IS_HOST_MODULE

ALL_MODULES.$(my_register_name).TARGET_BUILT := \

    $(ALL_MODULES.$(my_register_name).TARGET_BUILT) $(LOCAL_BUILT_MODULE)

endif

ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

ALL_MODULES.$(my_register_name).INSTALLED := \

    $(strip $(ALL_MODULES.$(my_register_name).INSTALLED) \

core/binary.mk

+3 −3
Original line number Diff line number Diff line
@@ -1214,17 +1214,17 @@ else ifdef LOCAL_USE_VNDK 
        # with vendor_available: false

        my_link_type := native:vendor

        my_warn_types :=

        my_allowed_types := native:vendor native:vndk

        my_allowed_types := native:vendor native:vndk native:platform_vndk

    endif

else ifneq ($(filter $(TARGET_RECOVERY_OUT)/%,$(call get_non_asan_path,$(LOCAL_MODULE_PATH))),)

my_link_type := native:recovery

my_warn_types :=

# TODO(b/113303515) remove native:platform and my_allowed_ndk_types

my_allowed_types := native:recovery native:platform $(my_allowed_ndk_types)

my_allowed_types := native:recovery native:platform native:platform_vndk $(my_allowed_ndk_types)

else

my_link_type := native:platform

my_warn_types := $(my_warn_ndk_types)

my_allowed_types := $(my_allowed_ndk_types) native:platform

my_allowed_types := $(my_allowed_ndk_types) native:platform native:platform_vndk

endif



my_link_deps := $(addprefix STATIC_LIBRARIES:,$(my_whole_static_libraries) $(my_static_libraries))

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ LOCAL_USE_VNDK:= 
LOCAL_USES_LIBRARIES:=

LOCAL_VENDOR_MODULE:=

LOCAL_VINTF_FRAGMENTS:=

LOCAL_VNDK_DEPEND_ON_CORE_VARIANT:=

LOCAL_VTSC_FLAGS:=

LOCAL_VTS_INCLUDES:=

LOCAL_VTS_MODE:=

core/definitions.mk

+28 −0
Original line number Diff line number Diff line
@@ -649,6 +649,18 @@ define module-installed-files 
$(foreach module,$(1),$(ALL_MODULES.$(module).INSTALLED))

endef



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

## Convert a list of short modules names (e.g., "framework", "Browser")

## into the list of files that are built *for the target* for those modules.

## NOTE: this won't return reliable results until after all

## sub-makefiles have been included.

## $(1): target list

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



define module-target-built-files

$(foreach module,$(1),$(ALL_MODULES.$(module).TARGET_BUILT))

endef



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

## Convert a list of short modules names (e.g., "framework", "Browser")

## into the list of files that should be used when linking
@@ -3386,3 +3398,19 @@ $(KATI_obsolete_var \ 
  initialize-package-file \

  add-jni-shared-libs-to-package,\

  These functions have been removed)



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

## Verify the variants of a VNDK library are identical

##

## $(1): Path to the core variant shared library file.

## $(2): Path to the vendor variant shared library file.

## $(3): TOOLS_PREFIX

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

LIBRARY_IDENTITY_CHECK_SCRIPT := build/make/tools/check_identical_lib.sh

define verify-vndk-libs-identical

@echo "Checking VNDK vendor variant: $(2)"

$(hide) CLANG_BIN="$(LLVM_PREBUILTS_PATH)" \

	CROSS_COMPILE="$(strip $(3))" \

	XZ="$(XZ)" \

	$(LIBRARY_IDENTITY_CHECK_SCRIPT) $(SOONG_STRIP_PATH) $(1) $(2)

endef

core/dpi_specific_apk.mk

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ endif 
ALL_MODULES += $(dpi_apk_name)

ALL_MODULES.$(dpi_apk_name).CLASS := APPS

ALL_MODULES.$(dpi_apk_name).BUILT := $(built_dpi_apk)

ALL_MODULES.$(dpi_apk_name).TARGET_BUILT := $(built_dpi_apk)

PACKAGES := $(PACKAGES) $(dpi_apk_name)

PACKAGES.$(dpi_apk_name).PRIVATE_KEY := $(private_key)

PACKAGES.$(dpi_apk_name).CERTIFICATE := $(certificate)