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

Commit 19aae52c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "vintf_data" into main 

* changes:
  Change VINTF_FRAMEWORK_MANIFEST_FROZEN_DIR to a fix value
  Export related variables for vintf_data to soong
parents 9f2ea2ec d46dbd53

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5298,7 +5298,7 @@ $(vintffm_log): $(HOST_OUT_EXECUTABLES)/vintffm $(check_vintf_system_deps) $(APE 
	  --dirmap /system_ext:$(TARGET_OUT_SYSTEM_EXT) \

	  --dirmap /product:$(TARGET_OUT_PRODUCT) \

	  --dirmap /apex:$(APEX_OUT) \

	  $(VINTF_FRAMEWORK_MANIFEST_FROZEN_DIR) > $@ 2>&1 ) || ( cat $@ && exit 1 )

	  system/libhidl/vintfdata/frozen > $@ 2>&1 ) || ( cat $@ && exit 1 )



$(call declare-1p-target,$(vintffm_log))

core/soong_config.mk

+20 −0
Original line number Diff line number Diff line
@@ -435,6 +435,26 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 


$(call end_json_map)



# For converting vintf_data

$(call add_json_list, DeviceMatrixFile, $(DEVICE_MATRIX_FILE))

$(call add_json_list, ProductManifestFiles, $(PRODUCT_MANIFEST_FILES))

$(call add_json_list, SystemManifestFile, $(DEVICE_FRAMEWORK_MANIFEST_FILE))

SYSTEM_EXT_HWSERVICE_FILES :=

ifeq ($(PRODUCT_HIDL_ENABLED),true)

  ifneq ($(filter hwservicemanager,$(PRODUCT_PACKAGES)),)

    SYSTEM_EXT_HWSERVICE_FILES += system/hwservicemanager/hwservicemanager_no_max.xml

  else

    $(error If PRODUCT_HIDL_ENABLED is set, hwservicemanager must be added to PRODUCT_PACKAGES explicitly)

  endif

else

  ifneq ($(filter hwservicemanager,$(PRODUCT_PACKAGES)),)

    SYSTEM_EXT_HWSERVICE_FILES += system/hwservicemanager/hwservicemanager.xml

  else ifneq ($(filter hwservicemanager,$(PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34)),)

    SYSTEM_EXT_HWSERVICE_FILES += system/hwservicemanager/hwservicemanager.xml

  endif

endif

$(call add_json_list, SystemExtManifestFiles, $(SYSTEM_EXT_MANIFEST_FILES) $(SYSTEM_EXT_HWSERVICE_FILES))



$(call json_end)



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