StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Split up fs_config_* modules per partition."

Browse Source
This commit is contained in:
Anton Hansson
2018-06-27 12:59:22 +00:00
committed by Gerrit Code Review
parent cc496f9b61 e85ec84eef
commit 4e0ccc4c8a
3 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/base_system.mk
View File

@@ -72,6 +72,8 @@ PRODUCT_PACKAGES += \
framework-res \ framework-res \
framework-sysconfig.xml \ framework-sysconfig.xml \
fsck_msdos \ fsck_msdos \
fs_config_files_system \
fs_config_dirs_system \
gatekeeperd \ gatekeeperd \
healthd \ healthd \
hid \ hid \

4
target/product/base_vendor.mk
View File

@@ -20,8 +20,8 @@ PRODUCT_PACKAGES += \
android.hardware.configstore@1.0-service \ android.hardware.configstore@1.0-service \
android.hardware.media.omx@1.0-service \ android.hardware.media.omx@1.0-service \
device_compatibility_matrix.xml \ device_compatibility_matrix.xml \
fs_config_files \ fs_config_files_nonsystem \
fs_config_dirs \ fs_config_dirs_nonsystem \
gralloc.default \ gralloc.default \
group \ group \
libbundlewrapper \ libbundlewrapper \

57
tools/fs_config/Android.mk
View File

@@ -111,13 +111,57 @@ fs_config_generate_extra_partition_list := $(strip \
$(if $(BOARD_USES_ODMIMAGE)$(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE),odm)) $(if $(BOARD_USES_ODMIMAGE)$(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE),odm))
################################## ##################################
# Generate the system/etc/fs_config_dirs binary file for the target # 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 # Add fs_config_dirs to PRODUCT_PACKAGES in the device make file to enable.
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_dirs 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_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 include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin) $(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)
@mkdir -p $(dir $@) @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 # 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) include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_files LOCAL_MODULE := fs_config_files_system
LOCAL_MODULE_CLASS := ETC 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 include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin) $(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)