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

Commit 589439ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" am: 947cb0fd 

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

Change-Id: I168a038826b5f62b74753f9c01d97d294f30eed7
parents fe24aaff 947cb0fd

core/base_rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ non_system_module := $(filter true, \ 


include $(BUILD_SYSTEM)/local_vndk.mk

include $(BUILD_SYSTEM)/local_systemsdk.mk

include $(BUILD_SYSTEM)/local_current_sdk.mk



my_module_tags := $(LOCAL_MODULE_TAGS)

ifeq ($(my_host_cross),true)

core/config.mk

+10 −0
Original line number Diff line number Diff line
@@ -720,6 +720,16 @@ ifndef BOARD_SYSTEMSDK_VERSIONS 
  endif

endif



ifndef BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES

  BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES := current

else

  ifdef PRODUCT_SHIPPING_API_LEVEL

    ifneq ($(call math_lt,$(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES),$(PRODUCT_SHIPPING_API_LEVEL)),)

      $(error BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES ($(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES)) must be greater than or equal to PRODUCT_SHIPPING_API_LEVEL ($(PRODUCT_SHIPPING_API_LEVEL)))

    endif

  endif

endif

.KATI_READONLY := BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES



ifdef PRODUCT_SHIPPING_API_LEVEL

  ifneq ($(call numbers_less_than,$(PRODUCT_SHIPPING_API_LEVEL),$(BOARD_SYSTEMSDK_VERSIONS)),)

core/local_current_sdk.mk

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

# Copyright (C) 2020 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_CURRENT_API_LEVEL_FOR_VENDOR_MODULES

  ifneq (current,$(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES))

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

      ifeq (current,$(LOCAL_SDK_VERSION))

        LOCAL_SDK_VERSION := $(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES)

      else ifeq (system_current,$(LOCAL_SDK_VERSION))

        LOCAL_SDK_VERSION := system_$(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES)

      endif

    endif

  endif

endif

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ $(foreach namespace,$(SOONG_CONFIG_NAMESPACES),\ 
$(call end_json_map)



$(call add_json_bool, EnforceProductPartitionInterface,  $(PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE))

$(call add_json_str,  DeviceCurrentApiLevelForVendorModules,  $(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES))



$(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))