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

Commit 775559ad authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Deprecate VNDK-Lite" am: c8343a3f 

Original change: https://android-review.googlesource.com/c/platform/build/+/1351286

Change-Id: I7b66829c410acabcbf403c14d91ab8b8faa30794
parents 4e4699af c8343a3f

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ $(KATI_obsolete_var PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_WHITELIST,Us 
$(KATI_obsolete_var PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST,Use PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST.)

$(KATI_obsolete_var COVERAGE_PATHS,Use NATIVE_COVERAGE_PATHS instead)

$(KATI_obsolete_var COVERAGE_EXCLUDE_PATHS,Use NATIVE_COVERAGE_EXCLUDE_PATHS instead)

$(KATI_obsolete_var BOARD_VNDK_RUNTIME_DISABLE,VNDK-Lite is no longer supported.)



# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

core/main.mk

+0 −6
Original line number Diff line number Diff line
@@ -232,12 +232,6 @@ ifdef BOARD_VNDK_VERSION 
  else

    ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)

  endif

  ifdef BOARD_VNDK_RUNTIME_DISABLE

    ADDITIONAL_VENDOR_PROPERTIES += ro.vndk.lite=true

  endif

else

  ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)

  ADDITIONAL_VENDOR_PROPERTIES += ro.vndk.lite=true

endif



# Add cpu properties for bionic and ART.

core/soong_cc_prebuilt.mk

+4 −1
Original line number Diff line number Diff line
@@ -113,10 +113,13 @@ my_check_same_vndk_variants := 
ifeq ($(LOCAL_CHECK_SAME_VNDK_VARIANTS),true)

  ifeq ($(filter hwaddress address, $(SANITIZE_TARGET)),)

    ifneq ($(CLANG_COVERAGE),true)

        # Do not compare VNDK variant for special cases e.g. coverage builds.

        ifneq ($(SKIP_VNDK_VARIANTS_CHECK),true)

            my_check_same_vndk_variants := true

        endif

    endif

  endif

endif



ifeq ($(my_check_same_vndk_variants),true)

  same_vndk_variants_stamp := $(intermediates)/same_vndk_variants.timestamp

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ $(call add_json_str, DeviceVndkVersion, $(BOARD_VNDK_VERSION)) 
$(call add_json_str,  Platform_vndk_version,             $(PLATFORM_VNDK_VERSION))

$(call add_json_str,  ProductVndkVersion,                $(PRODUCT_PRODUCT_VNDK_VERSION))

$(call add_json_list, ExtraVndkVersions,                 $(PRODUCT_EXTRA_VNDK_VERSIONS))

$(call add_json_bool, BoardVndkRuntimeDisable,           $(BOARD_VNDK_RUNTIME_DISABLE))

$(call add_json_list, DeviceSystemSdkVersions,           $(BOARD_SYSTEMSDK_VERSIONS))

$(call add_json_list, Platform_systemsdk_versions,       $(PLATFORM_SYSTEMSDK_VERSIONS))

$(call add_json_bool, Malloc_not_svelte,                 $(call invert_bool,$(filter true,$(MALLOC_SVELTE))))

core/tasks/vndk.mk

+0 −7
Original line number Diff line number Diff line
@@ -20,18 +20,11 @@ ifeq ($(BOARD_VNDK_VERSION),current) 
# PLATFORM_VNDK_VERSION must be set.

ifneq (,$(PLATFORM_VNDK_VERSION))



# BOARD_VNDK_RUNTIME_DISABLE must not be set to 'true'.

ifneq ($(BOARD_VNDK_RUNTIME_DISABLE),true)



.PHONY: vndk

vndk: $(SOONG_VNDK_SNAPSHOT_ZIP)



$(call dist-for-goals, vndk, $(SOONG_VNDK_SNAPSHOT_ZIP))



else # BOARD_VNDK_RUNTIME_DISABLE is set to 'true'

error_msg := "CANNOT generate VNDK snapshot. BOARD_VNDK_RUNTIME_DISABLE must not be set to 'true'."

endif # BOARD_VNDK_RUNTIME_DISABLE



else # PLATFORM_VNDK_VERSION is NOT set

error_msg := "CANNOT generate VNDK snapshot. PLATFORM_VNDK_VERSION must be set."

endif # PLATFORM_VNDK_VERSION