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

Commit e85ec84e authored by Anton Hansson's avatar Anton Hansson
Browse files

Split up fs_config_* modules per partition. 

This was already done for partitions other than the system partition.
Add new, separate "_system" targets, and add new phony modules which
collects _system and _nonsystem targets for now.

Update the base_system.mk file to only depend on the system module, and
put the other ones in base_vendor.mk for now.

Bug: 80410283
Test: make fs_config_dirs[_*] fs_config_files[_*] and verify output
Change-Id: I7843578dbb9f27edf4c1e5b4a795a530f79e0be1
parent a314fc01

target/product/base_system.mk

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ PRODUCT_PACKAGES += \ 
    framework-res \

    framework-sysconfig.xml \

    fsck_msdos \

    fs_config_files_system \

    fs_config_dirs_system \

    gatekeeperd \

    healthd \

    hid \

target/product/base_vendor.mk

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ PRODUCT_PACKAGES += \ 
    android.hardware.configstore@1.0-service \

    android.hardware.media.omx@1.0-service \

    device_compatibility_matrix.xml \

    fs_config_files \

    fs_config_dirs \

    fs_config_files_nonsystem \

    fs_config_dirs_nonsystem \

    gralloc.default \

    group \

    libbundlewrapper \

tools/fs_config/Android.mk

+51 −6
Original line number Diff line number Diff line
@@ -111,13 +111,57 @@ fs_config_generate_extra_partition_list := $(strip \ 
  $(if $(BOARD_USES_ODMIMAGE)$(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE),odm))



##################################

# Generate the system/etc/fs_config_dirs binary file for the target

# Add fs_config_dirs to PRODUCT_PACKAGES in the device make file to enable

# Generate the <p>/etc/fs_config_dirs binary files for each partition.

# Add fs_config_dirs to PRODUCT_PACKAGES in the device make file to enable.

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs

LOCAL_REQUIRED_MODULES := \

	fs_config_dirs_system \

	$(foreach t,$(fs_config_generate_extra_partition_list),$(LOCAL_MODULE)_$(t))

include $(BUILD_PHONY_PACKAGE)





##################################

# Generate the <p>/etc/fs_config_files binary files for each partition.

# Add fs_config_files to PRODUCT_PACKAGES in the device make file to enable.

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files

LOCAL_REQUIRED_MODULES := \

  fs_config_files_system \

  $(foreach t,$(fs_config_generate_extra_partition_list),$(LOCAL_MODULE)_$(t))

include $(BUILD_PHONY_PACKAGE)



##################################

# Generate the <p>/etc/fs_config_dirs binary files for all enabled partitions

# excluding /system. Add fs_config_dirs_nonsystem to PRODUCT_PACKAGES in the

# device make file to enable.

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_nonsystem

LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),fs_config_dirs_$(t))

include $(BUILD_PHONY_PACKAGE)



##################################

# Generate the <p>/etc/fs_config_files binary files for all enabled partitions

# excluding /system. Add fs_config_files_nonsystem to PRODUCT_PACKAGES in the

# device make file to enable.

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_nonsystem

LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),fs_config_files_$(t))

include $(BUILD_PHONY_PACKAGE)



##################################

# Generate the system/etc/fs_config_dirs binary file for the target

# Add fs_config_dirs or fs_config_dirs_system to PRODUCT_PACKAGES in

# the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_system

LOCAL_MODULE_CLASS := ETC

LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),$(LOCAL_MODULE)_$(t))

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

	@mkdir -p $(dir $@)
@@ -127,12 +171,13 @@ $(LOCAL_BUILT_MODULE): $(fs_config_generate_bin) 


##################################

# Generate the system/etc/fs_config_files binary file for the target

# Add fs_config_files to PRODUCT_PACKAGES in the device make file to enable

# Add fs_config_files or fs_config_files_system to PRODUCT_PACKAGES in

# the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files

LOCAL_MODULE := fs_config_files_system

LOCAL_MODULE_CLASS := ETC

LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),$(LOCAL_MODULE)_$(t))

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

	@mkdir -p $(dir $@)