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

Commit fdeacfd3 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Remove PLATFORM_VNDK_VERSION related code 

As of VNDK deprecation, PLATFORM_VNDK_VERSION should no longer be used.
This change removes most of references for PLATFORM_VNDK_VERSION
variable.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: I9293deffc01d2431740c43ecae23719a9171f344
parent f8e79197

core/board_config.mk

+0 −9
Original line number Diff line number Diff line
@@ -973,15 +973,6 @@ define check_vndk_version 
  $(if $(wildcard $(vndk_path)/*/Android.bp),,$(error VNDK version $(1) not found))

endef



ifeq ($(KEEP_VNDK),true)

ifeq ($(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION))

  $(error BOARD_VNDK_VERSION is equal to PLATFORM_VNDK_VERSION; use BOARD_VNDK_VERSION := current)

endif

ifneq ($(BOARD_VNDK_VERSION),current)

  $(call check_vndk_version,$(BOARD_VNDK_VERSION))

endif

endif



TARGET_VENDOR_TEST_SUFFIX := /vendor



ifeq (,$(TARGET_BUILD_UNBUNDLED))

core/main.mk

+0 −26
Original line number Diff line number Diff line
@@ -221,20 +221,6 @@ ADDITIONAL_SYSTEM_PROPERTIES += $(foreach s,$(SANITIZE_TARGET),ro.sanitize.$(s)= 
# mount system_other partition.

ADDITIONAL_SYSTEM_PROPERTIES += ro.postinstall.fstab.prefix=/system



# -----------------------------------------------------------------

# ADDITIONAL_VENDOR_PROPERTIES will be installed in vendor/build.prop if

# property_overrides_split_enabled is true. Otherwise it will be installed in

# /system/build.prop

ifeq ($(KEEP_VNDK),true)

ifdef BOARD_VNDK_VERSION

  ifeq ($(BOARD_VNDK_VERSION),current)

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

  else

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

  endif

endif

endif



# Add cpu properties for bionic and ART.

ADDITIONAL_VENDOR_PROPERTIES += ro.bionic.arch=$(TARGET_ARCH)

ADDITIONAL_VENDOR_PROPERTIES += ro.bionic.cpu_variant=$(TARGET_CPU_VARIANT_RUNTIME)
@@ -346,18 +332,6 @@ ADDITIONAL_VENDOR_PROPERTIES += \ 
    ro.build.ab_update=$(AB_OTA_UPDATER)

endif



# Set ro.product.vndk.version to PLATFORM_VNDK_VERSION only if

# KEEP_VNDK is true, PRODUCT_PRODUCT_VNDK_VERSION is current and

# PLATFORM_VNDK_VERSION is less than or equal to 35.

# ro.product.vndk.version must be removed for the other future builds.

ifeq ($(KEEP_VNDK)|$(PRODUCT_PRODUCT_VNDK_VERSION),true|current)

ifeq ($(call math_is_number,$(PLATFORM_VNDK_VERSION)),true)

ifeq ($(call math_lt_or_eq,$(PLATFORM_VNDK_VERSION),35),true)

ADDITIONAL_PRODUCT_PROPERTIES += ro.product.vndk.version=$(PLATFORM_VNDK_VERSION)

endif

endif

endif



ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)



ifeq ($(AB_OTA_UPDATER),true)

core/soong_cc_rust_prebuilt.mk

+0 −8
Original line number Diff line number Diff line
@@ -38,14 +38,6 @@ ifndef LOCAL_UNINSTALLABLE_MODULE 
  endif

endif



# Don't install modules of current VNDK when it is told so

ifeq ($(TARGET_SKIP_CURRENT_VNDK),true)

  ifeq ($(LOCAL_SOONG_VNDK_VERSION),$(PLATFORM_VNDK_VERSION))

    LOCAL_UNINSTALLABLE_MODULE := true

  endif

endif





# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE

# to avoid checkbuilds making an extra copy of every module.

LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)

core/tasks/vndk.mk

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
# Copyright (C) 2017 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



current_makefile := $(lastword $(MAKEFILE_LIST))



# BOARD_VNDK_VERSION must be set to 'current' in order to generate a VNDK snapshot.

ifeq ($(BOARD_VNDK_VERSION),current)



# PLATFORM_VNDK_VERSION must be set.

ifneq (,$(PLATFORM_VNDK_VERSION))



.PHONY: vndk

vndk: $(SOONG_VNDK_SNAPSHOT_ZIP)



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



else # PLATFORM_VNDK_VERSION is NOT set

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

endif # PLATFORM_VNDK_VERSION



else # BOARD_VNDK_VERSION is NOT set to 'current'

error_msg := "CANNOT generate VNDK snapshot. BOARD_VNDK_VERSION must be set to 'current'."

endif # BOARD_VNDK_VERSION



ifneq (,$(error_msg))



.PHONY: vndk

vndk: PRIVATE_MAKEFILE := $(current_makefile)

vndk:

	$(call echo-error,$(PRIVATE_MAKEFILE),$(error_msg))

	exit 1



endif

core/version_util.mk

+0 −19
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#     BUILD_ID

#     BUILD_NUMBER

#     PLATFORM_SECURITY_PATCH

#     PLATFORM_VNDK_VERSION

#     PLATFORM_SYSTEMSDK_VERSIONS

#     PLATFORM_VERSION_LAST_STABLE

#     PLATFORM_VERSION_KNOWN_CODENAMES
@@ -151,24 +150,6 @@ ifndef DEFAULT_APP_TARGET_SDK 
endif

.KATI_READONLY := DEFAULT_APP_TARGET_SDK



ifeq ($(KEEP_VNDK),true)

  ifndef PLATFORM_VNDK_VERSION

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

    # With trunk stable, VNDK will not be frozen but deprecated.

    # This version will be removed with the VNDK deprecation.

    ifeq (REL,$(PLATFORM_VERSION_CODENAME))

      ifdef RELEASE_PLATFORM_VNDK_VERSION

        PLATFORM_VNDK_VERSION := $(RELEASE_PLATFORM_VNDK_VERSION)

      else

        PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)

      endif

    else

      PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)

    endif

  endif

  .KATI_READONLY := PLATFORM_VNDK_VERSION

endif



ifndef PLATFORM_SYSTEMSDK_MIN_VERSION

  # This is the oldest version of system SDK that the platform supports. Contrary

  # to the public SDK where platform essentially supports all previous SDK versions,