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

Commit 4de1dc97 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Add PLATFORM_SYSTEMSDK_VERSIONS and BOARD_SYSTEMSDK_VERSIONS" 

am: ae891fb1

Change-Id: I7823d7c0b97fd2f7b3d2f757b3dc76ef848eea7d
parents a5d0ec68 ae891fb1

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ $(call pretty-error,Only one of LOCAL_PROPRIETARY_MODULE[$(LOCAL_PROPRIETARY_MOD 
endif



include $(BUILD_SYSTEM)/local_vndk.mk

include $(BUILD_SYSTEM)/local_vsdk.mk

include $(BUILD_SYSTEM)/local_systemsdk.mk



my_module_tags := $(LOCAL_MODULE_TAGS)

ifeq ($(my_host_cross),true)

core/envsetup.mk

+7 −0
Original line number Diff line number Diff line
@@ -304,6 +304,13 @@ ifdef PRODUCT_EXTRA_VNDK_VERSIONS 
  $(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))

endif



# Ensure that BOARD_SYSTEMSDK_VERSIONS are all within PLATFORM_SYSTEMSDK_VERSIONS

_unsupported_systemsdk_versions := $(filter-out $(PLATFORM_SYSTEMSDK_VERSIONS),$(BOARD_SYSTEMSDK_VERSIONS))

ifneq (,$(_unsupported_systemsdk_versions))

  $(error System SDK versions '$(_unsupported_systemsdk_versions)' in BOARD_SYSTEMSDK_VERSIONS are not supported.\

          Supported versions are $(PLATFORM_SYSTEMSDK_VERSIONS))

endif



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

# Set up configuration for target machine.

# The following must be set:

core/local_systemsdk.mk

0 → 100644
+56 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2018 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.

#



ifdef BOARD_SYSTEMSDK_VERSIONS

  # Apps and jars in vendor or odm partition are forced to build against System SDK.

  _is_vendor_app :=

  ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

    # Note: no need to check LOCAL_MODULE_PATH* since LOCAL_[VENDOR|ODM|OEM]_MODULE is already

    # set correctly before this is included.

    _is_vendor_app := true

  endif

  ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))

    ifndef LOCAL_SDK_VERSION

      ifeq ($(_is_vendor_app),true)

        LOCAL_SDK_VERSION := system_current

      endif

    endif

  endif

endif



# Ensure that the selected System SDK version is one of the supported versions.

# The range of support versions becomes narrower when BOARD_SYSTEMSDK_VERSIONS

# is set, which is a subset of PLATFORM_SYSTEMSDK_VERSIONS.

ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))

  ifneq ($(_is_vendor_app),true)

    # apps bundled in system partition can use all system sdk versions provided by the platform

    _supported_systemsdk_versions := $(PLATFORM_SYSTEMSDK_VERSIONS)

  else ifdef BOARD_SYSTEMSDK_VERSIONS

    # When BOARD_SYSTEMSDK_VERSIONS is set, vendors apps are restricted to use those versions

    # which is equal to or smaller than PLATFORM_SYSTEMSDK_VERSIONS

    _supported_systemsdk_versions := $(BOARD_SYSTEMSDK_VERSIONS)

  else

    # If not, vendor apks are treated equally to system apps

    _supported_systemsdk_versions := $(PLATFORM_SYSTEMSDK_VERSIONS)

  endif

  _system_sdk_version := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))

  ifneq ($(_system_sdk_version),$(filter $(_system_sdk_version),$(_supported_systemsdk_versions)))

    $(call pretty-error,Incompatible LOCAL_SDK_VERSION '$(LOCAL_SDK_VERSION)'. \

           System SDK version '$(_system_sdk_version)' is not supported. Supported versions are: $(_supported_systemsdk_versions))

  endif

  _system_sdk_version :=

  _supported_systemsdk_versions :=

endif

core/local_vsdk.mk

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 


ifdef BOARD_VSDK_VERSION

# Set LOCAL_SDK_VERSION to system_current, If LOCAL_SDK_VERSION is not defined and LOCAL_VENDOR_MODULE is true

  _is_vendor_app :=

  ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_OEM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

    _is_vendor_app := true

  else

    ifneq (,$(filter $(TARGET_OUT_VENDOR)%,$(LOCAL_MODULE_PATH) $(LOCAL_MODULE_PATH_32) $(LOCAL_MODULE_PATH_64)))

      _is_vendor_app := true

    endif

  endif

  ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))

    ifndef LOCAL_SDK_VERSION

      ifeq ($(_is_vendor_app),true)

        LOCAL_SDK_VERSION := system_current

      endif

    endif

  endif

endif

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ $(call add_json_bool, DevicePrefer32BitExecutables, $(filter true,$(TARGET_ 
$(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_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))))

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