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

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

Merge changes from topics... 

Merge changes from topics "revert-2897484-revert-2897682-dont_limit_systemsdk-JCOOOXGAIF-BSJGJAJAWC", "revert-2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS-ROJNXPXKUV" into main am: 32fd2dee am: 6ed485ed am: 4248a4b7

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



Change-Id: Ic55b43eed11649f1bcb46eef6a27b70d20bacd69
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbda6b3e 4248a4b7

core/base_rules.mk

+9 −1
Original line number Diff line number Diff line
@@ -121,9 +121,17 @@ non_system_module := $(filter true, \ 
   $(LOCAL_PROPRIETARY_MODULE))



include $(BUILD_SYSTEM)/local_vndk.mk

include $(BUILD_SYSTEM)/local_systemsdk.mk



# local_current_sdk needs to run before local_systemsdk because the former may override

# LOCAL_SDK_VERSION which is used by the latter.

include $(BUILD_SYSTEM)/local_current_sdk.mk



# Check if the use of System SDK is correct. Note that, for Soong modules, the system sdk version

# check is done in Soong. No need to do it twice.

ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

include $(BUILD_SYSTEM)/local_systemsdk.mk

endif



# Ninja has an implicit dependency on the command being run, and kati will

# regenerate the ninja manifest if any read makefile changes, so there is no

# need to have dependencies on makefiles.

core/board_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ _build_broken_var_list := \ 
  BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES \

  BUILD_BROKEN_INCORRECT_PARTITION_IMAGES \

  BUILD_BROKEN_GENRULE_SANDBOXING \

  BUILD_BROKEN_DONT_CHECK_SYSTEMSDK \



_build_broken_var_list += \

  $(foreach m,$(AVAILABLE_BUILD_MODULE_TYPES) \

core/local_current_sdk.mk

+14 −3
Original line number Diff line number Diff line
@@ -14,13 +14,24 @@ 
# limitations under the License.

#

ifdef BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES

  ifneq (current,$(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES))

  _override_to := $(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES)



  # b/314011075: apks and jars in the vendor or odm partitions cannot use

  # system SDK 35 and beyond. In order not to suddenly break those vendor

  # modules using current or system_current as their LOCAL_SDK_VERSION,

  # override it to 34, which is the maximum API level allowed for them.

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

    _override_to := 34

  endif



  ifneq (current,$(_override_to))

    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)

        LOCAL_SDK_VERSION := $(_override_to)

      else ifeq (system_current,$(LOCAL_SDK_VERSION))

        LOCAL_SDK_VERSION := system_$(BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES)

        LOCAL_SDK_VERSION := system_$(_override_to)

      endif

    endif

  endif

  _override_to :=

endif

core/local_systemsdk.mk

+30 −2
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ ifdef BOARD_SYSTEMSDK_VERSIONS 
          # Runtime resource overlays are exempted from building against System SDK.

          # TODO(b/155027019): remove this, after no product/vendor apps rely on this behavior.

          LOCAL_SDK_VERSION := system_current

          # We have run below again since LOCAL_SDK_VERSION is newly set and the "_current"

          # may have to be updated

          include $(BUILD_SYSTEM)/local_current_sdk.mk

        endif

      endif

    endif
@@ -54,11 +57,36 @@ ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION))) 
    # If not, vendor apks are treated equally to system apps

    _supported_systemsdk_versions := $(PLATFORM_SYSTEMSDK_VERSIONS)

  endif



  # b/314011075: apks and jars in the vendor or odm partitions cannot use system SDK 35 and beyond.

  # This is to discourage the use of Java APIs in the partitions, which hasn't been supported since

  # the beginning of the project Treble back in Android 10. Ultimately, we'd like to completely

  # disallow any Java API in the partitions, but it shall be done progressively.

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

    # 28 is the API level when BOARD_SYSTEMSDK_VERSIONS was introduced. So, it's the oldset API

    # we allow.

    _supported_systemsdk_versions := $(call int_range_list, 28, 34)

  endif



  # Extract version number from LOCAL_SDK_VERSION (ex: system_34 -> 34)

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

  # However, the extraction may fail if it doesn't have any number (i.e. current, core_current,

  # system_current, or similar) Then use the latest platform SDK version number or the actual

  # codename.

  ifeq (,$(_system_sdk_version)

    ifeq (REL,$(PLATFORM_VERSION_CODENAME))

      _system_sdk_version := $(PLATFORM_SDK_VERSION)

    else

      _system_sdk_version := $(PLATFORM_VERSION_CODENAME)

    endif

  endif



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

    ifneq (true,$(BUILD_BROKEN_DONT_CHECK_SYSTEMSDK)

      $(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

  endif

  _system_sdk_version :=

  _supported_systemsdk_versions :=

endif

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ $(call add_json_bool, BuildBrokenUsesSoongPython2Modules, $(filter true,$(BUILD 
$(call add_json_bool, BuildBrokenVendorPropertyNamespace,  $(filter true,$(BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE)))

$(call add_json_bool, BuildBrokenIncorrectPartitionImages, $(filter true,$(BUILD_BROKEN_INCORRECT_PARTITION_IMAGES)))

$(call add_json_list, BuildBrokenInputDirModules,          $(BUILD_BROKEN_INPUT_DIR_MODULES))

$(call add_json_bool, BuildBrokenDontCheckSystemSdk,       $(filter true,$(BUILD_BROKEN_DONT_CHECK_SYSTEMSDK)))



$(call add_json_list, BuildWarningBadOptionalUsesLibsAllowlist,    $(BUILD_WARNING_BAD_OPTIONAL_USES_LIBS_ALLOWLIST))