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

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

Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f... 

Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f am: 324a3729 am: 75f27589 am: 1645d407

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

Change-Id: I05aa2551e0caf8ad12d169d44e183cdb4408205e
parents def954f9 1645d407

target/product/base_product.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


# Base modules and settings for the product partition.

PRODUCT_PACKAGES += \

    fs_config_dirs_product \

    fs_config_files_product \

    group_product \

    ModuleMetadata \

    passwd_product \

target/product/base_system_ext.mk

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


# Base modules and settings for the system_ext partition.

PRODUCT_PACKAGES += \

    fs_config_dirs_system_ext \

    fs_config_files_system_ext \

    group_system_ext \

    system_ext_manifest.xml \

    passwd_system_ext \

    selinux_policy_system_ext \

    system_ext_manifest.xml \

tools/fs_config/Android.mk

+89 −48
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ fs_config_generate_extra_partition_list := $(strip \ 
  $(if $(BOARD_USES_ODMIMAGE)$(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE),odm) \

  $(if $(BOARD_USES_VENDOR_DLKMIMAGE)$(BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE),vendor_dlkm) \

  $(if $(BOARD_USES_ODM_DLKMIMAGE)$(BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE),odm_dlkm) \

  $(if $(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),product) \

  $(if $(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),system_ext) \

)



##################################
@@ -46,10 +44,11 @@ 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))

  fs_config_dirs_system_ext \

  fs_config_dirs_product \

  fs_config_dirs_nonsystem

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.
@@ -58,27 +57,69 @@ 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))

  fs_config_files_system_ext \

  fs_config_files_product \

  fs_config_files_nonsystem

include $(BUILD_PHONY_PACKAGE)



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

# Generate the system_ext/etc/fs_config_dirs binary file for the target if the

# system_ext partition is generated. Add fs_config_dirs or fs_config_dirs_system_ext

# to PRODUCT_PACKAGES in the device make file to enable.

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_system_ext

LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),_fs_config_dirs_system_ext)

include $(BUILD_PHONY_PACKAGE)



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

# Generate the system_ext/etc/fs_config_files binary file for the target if the

# system_ext partition is generated. Add fs_config_files or fs_config_files_system_ext

# to PRODUCT_PACKAGES in the device make file to enable.

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_system_ext

LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),_fs_config_files_system_ext)

include $(BUILD_PHONY_PACKAGE)



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

# Generate the product/etc/fs_config_dirs binary file for the target if the

# product partition is generated. Add fs_config_dirs or fs_config_dirs_product

# to PRODUCT_PACKAGES in the device make file to enable.

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_product

LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),_fs_config_dirs_product)

include $(BUILD_PHONY_PACKAGE)



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

# Generate the product/etc/fs_config_files binary file for the target if the

# product partition is generated. Add fs_config_files or fs_config_files_product

# to PRODUCT_PACKAGES in the device make file to enable.

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_product

LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),_fs_config_files_product)

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.

# excluding /system, /system_ext and /product. 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))

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.

# excluding /system, /system_ext and /product. 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))

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

include $(BUILD_PHONY_PACKAGE)



##################################
@@ -134,11 +175,11 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 
ifneq ($(filter vendor,$(fs_config_generate_extra_partition_list)),)

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

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

# Add fs_config_dirs or fs_config_dirs_vendor to PRODUCT_PACKAGES in

# the device make file to enable.

# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES

# in the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_vendor

LOCAL_MODULE := _fs_config_dirs_vendor

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
@@ -158,11 +199,11 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 


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

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

# Add fs_config_files or fs_config_files_vendor to PRODUCT_PACKAGES in

# the device make file to enable

# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES

# in the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_vendor

LOCAL_MODULE := _fs_config_files_vendor

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
@@ -185,11 +226,11 @@ endif 
ifneq ($(filter oem,$(fs_config_generate_extra_partition_list)),)

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

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

# Add fs_config_dirs or fs_config_dirs_oem to PRODUCT_PACKAGES in

# the device make file to enable

# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES

# in the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_oem

LOCAL_MODULE := _fs_config_dirs_oem

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc
@@ -209,11 +250,11 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 


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

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

# Add fs_config_files or fs_config_files_oem to PRODUCT_PACKAGES in

# the device make file to enable

# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES

# in the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_oem

LOCAL_MODULE := _fs_config_files_oem

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc
@@ -236,11 +277,11 @@ endif 
ifneq ($(filter odm,$(fs_config_generate_extra_partition_list)),)

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

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

# Add fs_config_dirs or fs_config_dirs_odm to PRODUCT_PACKAGES in

# the device make file to enable

# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES

# in the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_odm

LOCAL_MODULE := _fs_config_dirs_odm

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc
@@ -260,11 +301,11 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 


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

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

# Add fs_config_files of fs_config_files_odm to PRODUCT_PACKAGES in

# the device make file to enable

# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES

# in the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_odm

LOCAL_MODULE := _fs_config_files_odm

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc
@@ -287,11 +328,11 @@ endif 
ifneq ($(filter vendor_dlkm,$(fs_config_generate_extra_partition_list)),)

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

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

# Add fs_config_dirs or fs_config_dirs_vendor_dlkm to PRODUCT_PACKAGES in

# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES in

# the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_vendor_dlkm

LOCAL_MODULE := _fs_config_dirs_vendor_dlkm

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_DLKM)/etc
@@ -311,11 +352,11 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 


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

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

# Add fs_config_files of fs_config_files_vendor_dlkm to PRODUCT_PACKAGES in

# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES in

# the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_vendor_dlkm

LOCAL_MODULE := _fs_config_files_vendor_dlkm

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_DLKM)/etc
@@ -338,11 +379,11 @@ endif 
ifneq ($(filter odm_dlkm,$(fs_config_generate_extra_partition_list)),)

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

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

# Add fs_config_dirs or fs_config_dirs_odm_dlkm to PRODUCT_PACKAGES in

# the device make file to enable

# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES

# in the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_odm_dlkm

LOCAL_MODULE := _fs_config_dirs_odm_dlkm

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_ODM_DLKM)/etc
@@ -362,11 +403,11 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 


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

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

# Add fs_config_files of fs_config_files_odm_dlkm to PRODUCT_PACKAGES in

# the device make file to enable

# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES

# in the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_odm_dlkm

LOCAL_MODULE := _fs_config_files_odm_dlkm

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_ODM_DLKM)/etc
@@ -386,14 +427,14 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 


endif



ifneq ($(filter product,$(fs_config_generate_extra_partition_list)),)

ifneq ($(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),)

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

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

# Add fs_config_dirs or fs_config_dirs_product to PRODUCT_PACKAGES in

# the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_product

LOCAL_MODULE := _fs_config_dirs_product

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc
@@ -413,11 +454,11 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 


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

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

# Add fs_config_files of fs_config_files_product to PRODUCT_PACKAGES in

# Add fs_config_files or fs_config_files_product to PRODUCT_PACKAGES in

# the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_product

LOCAL_MODULE := _fs_config_files_product

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc
@@ -436,14 +477,14 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 
	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)

endif



ifneq ($(filter system_ext,$(fs_config_generate_extra_partition_list)),)

ifneq ($(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),)

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

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

# Add fs_config_dirs or fs_config_dirs_system_ext to PRODUCT_PACKAGES in

# the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_dirs_system_ext

LOCAL_MODULE := _fs_config_dirs_system_ext

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT)/etc
@@ -463,11 +504,11 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_G 


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

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

# Add fs_config_files of fs_config_files_system_ext to PRODUCT_PACKAGES in

# Add fs_config_files or fs_config_files_system_ext to PRODUCT_PACKAGES in

# the device make file to enable

include $(CLEAR_VARS)



LOCAL_MODULE := fs_config_files_system_ext

LOCAL_MODULE := _fs_config_files_system_ext

LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT)/etc