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

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

Merge "Remove checkPartitionsForJavaDependency()" into main am: 08f01833 

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



Change-Id: I5defeb90410771481ec673c29b4af23ffef3859a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5697c872 08f01833

core/product.mk

+0 −14
Original line number Diff line number Diff line
@@ -390,20 +390,6 @@ _product_single_value_vars += PRODUCT_OTA_FORCE_NON_AB_PACKAGE 
# If set, Java module in product partition cannot use hidden APIs.

_product_single_value_vars += PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE



# If set, only java_sdk_library can be used at inter-partition dependency.

# Note: Build error if BOARD_VNDK_VERSION is not set while

#       PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY is true, because

#       PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY has no meaning if

#       BOARD_VNDK_VERSION is not set.

# Note: When PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE is not set, there are

#       no restrictions at dependency between system and product partition.

_product_single_value_vars += PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY



# Allowlist for PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY option.

# Listed modules are allowed at inter-partition dependency even if it isn't

# a java_sdk_library module.

_product_list_vars += PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST



# Install a copy of the debug policy to the system_ext partition, and allow

# init-second-stage to load debug policy from system_ext.

# This option is only meant to be set by compliance GSI targets.

core/soong_config.mk

+0 −3
Original line number Diff line number Diff line
@@ -265,9 +265,6 @@ $(call end_json_map) 
$(call add_json_bool, EnforceProductPartitionInterface,  $(filter true,$(PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE)))

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



$(call add_json_bool, EnforceInterPartitionJavaSdkLibrary, $(filter true,$(PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY)))

$(call add_json_list, InterPartitionJavaLibraryAllowList, $(PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST))



$(call add_json_bool, CompressedApex, $(filter true,$(PRODUCT_COMPRESSED_APEX)))



ifndef APEX_BUILD_FOR_PRE_S_DEVICES