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

Commit 32b84909 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "vendor_property_enforce" 

* changes:
  Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to productVariables
parents 6d89e4a9 05d59519

core/board_config.mk

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

  BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW \

  BUILD_BROKEN_USES_NETWORK \

  BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE \

  BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES \



_build_broken_var_list += \

core/soong_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -244,6 +244,10 @@ $(call add_json_list, BoardKernelModuleInterfaceVersions, $(BOARD_KERNEL_MODULE_ 
$(call add_json_bool, BoardMoveRecoveryResourcesToVendorBoot, $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))

$(call add_json_str,  PrebuiltHiddenApiDir, $(BOARD_PREBUILT_HIDDENAPI_DIR))



$(call add_json_str,  ShippingApiLevel, $(PRODUCT_SHIPPING_API_LEVEL))



$(call add_json_bool, BuildBrokenVendorPropertyNamespace, $(BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE))



$(call json_end)



$(file >$(SOONG_VARIABLES).tmp,$(json_contents))

target/board/BoardConfigEmuCommon.mk

+3 −0
Original line number Diff line number Diff line
@@ -90,3 +90,6 @@ BOARD_FLASH_BLOCK_SIZE := 512 
DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml



BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common



# b/176210699: remove this

BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true