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

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

Merge "Define PLATFORM_VNDK_VERSION"

parents c0eabe6d 2a233b3b

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -444,6 +444,12 @@ $(call add-clean-step, rm -f $(OUT_DIR)/host/common/obj/*/*_intermediates/java-s 


$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*/flat-res)



# Remove old VNDK directories without version

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk-sp)



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

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

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

core/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -175,7 +175,11 @@ INSTALLED_VENDOR_DEFAULT_PROP_TARGET := $(TARGET_OUT_VENDOR)/default.prop 
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_VENDOR_DEFAULT_PROP_TARGET)



ifdef BOARD_VNDK_VERSION

FINAL_VENDOR_DEFAULT_PROPERTIES := ro.vndk.version=${BOARD_VNDK_VERSION}

  ifeq ($(BOARD_VNDK_VERSION),current)

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

  else

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

  endif

else

  FINAL_VENDOR_DEFAULT_PROPERTIES :=

endif

core/envsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ endef 


ifdef BOARD_VNDK_VERSION

  ifneq ($(BOARD_VNDK_VERSION),current)

    $(call check_vndk_version,$(BOARD_VNDK_VERSION))

    $(error BOARD_VNDK_VERSION: Only "current" is implemented)

  endif



  TARGET_VENDOR_TEST_SUFFIX := /vendor

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ $(call add_json_list, DeviceKernelHeaders, $(TARGET_PROJECT_SYSTEM 
$(call add_json_bool, DevicePrefer32BitExecutables,      $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)))

$(call add_json_val,  DeviceUsesClang,                   $(if $(USE_CLANG_PLATFORM_BUILD),$(USE_CLANG_PLATFORM_BUILD),false))

$(call add_json_str,  DeviceVndkVersion,                 $(BOARD_VNDK_VERSION))

$(call add_json_str,  Platform_vndk_version,             $(PLATFORM_VNDK_VERSION))

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

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

$(call add_json_str,  Override_rs_driver,                $(OVERRIDE_RS_DRIVER))

core/version_defaults.mk

+18 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#     BUILD_NUMBER

#     BUILD_DATETIME

#     PLATFORM_SECURITY_PATCH

#     PLATFORM_VNDK_VERSION

#



# Look for an optional file containing overrides of the defaults,
@@ -183,6 +184,23 @@ ifndef DEFAULT_APP_TARGET_SDK 
  endif

endif



ifndef PLATFORM_VNDK_VERSION

  # This is the definition of the VNDK version for the current VNDK libraries.

  # The version is only available when PLATFORM_VERSION_CODENAME == REL.

  # Otherwise, it will be set to "current". The ABI is allowed to be changed

  # only if PLATFORM_VNDK_VERSION == current. Once PLATFORM_VNDK_VERSION is set

  # to actual version, the ABI for this version will be frozon and emit build

  # errors if any ABI for the VNDK libs are changed.

  # After that the snapshot of the VNDK with this version will be generated.

  #

  # The version follows PLATFORM_SDK_VERSION.

  ifeq (REL,$(PLATFORM_VERSION_CODENAME))

    PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)

  else

    PLATFORM_VNDK_VERSION := current

  endif

endif



ifndef PLATFORM_SECURITY_PATCH

    #  Used to indicate the security patch that has been applied to the device.

    #  It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin.