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

Commit 9d924f67 authored by Tom Cherry's avatar Tom Cherry
Browse files

Use fs_config_generator.py to generate fs_config_files/dirs directly 

We want to remove target specific host tools and since
fs_config_generate is compiled with a target specific header file, we
instead remove fs_config_generate entirely and allow python to build
the fs_config_files/dirs files directly from config.fs files and
parsed C headers.

Test: associated unit tests and new end to end test
Test: aosp_sailfish, aosp_crosshatch build produces valid fs_config files
Test: aosp_cf_x86_phone build correctly produces empty fs_config files
Change-Id: Idbc63ff56c0979e1e4c17721371de9d9d02dc8ff
parent 1a9f8356

tools/fs_config/Android.bp

+0 −40
Original line number Diff line number Diff line
@@ -21,43 +21,3 @@ cc_binary_host { 
    ],

    cflags: ["-Werror"],

}
 


// -----------------------------------------------------------------------------

// Unit tests.

// -----------------------------------------------------------------------------



test_c_flags = [

    "-fstack-protector-all",

    "-g",

    "-Wall",

    "-Wextra",

    "-Werror",

    "-fno-builtin",

    "-DANDROID_FILESYSTEM_CONFIG=\"android_filesystem_config_test_data.h\"",

]



//#################################

// test executable

cc_test_host {

    name: "fs_config_generate_test",

    srcs: ["fs_config_generate.c"],

    shared_libs: ["libcutils"],

    cflags: test_c_flags,

    relative_install_path: "fs_config-unit-tests",

    no_named_install_directory: true,

    gtest: false,



}



//#################################

// gTest tool

cc_test_host {

    name: "fs_config-unit-tests",

    cflags: test_c_flags + ["-DHOST"],

    shared_libs: [

        "liblog",

        "libcutils",

        "libbase",

    ],

    srcs: ["fs_config_test.cpp"],

}

tools/fs_config/Android.mk

+155 −90
Original line number Diff line number Diff line
@@ -19,54 +19,14 @@ LOCAL_PATH := $(call my-dir) 
#   for generating the android_filesystem_config.h file.

#

# More information can be found in the README

ANDROID_FS_CONFIG_H := android_filesystem_config.h



ifneq ($(wildcard $(TARGET_DEVICE_DIR)/$(ANDROID_FS_CONFIG_H)),)

$(error Using $(ANDROID_FS_CONFIG_H) is deprecated, please use TARGET_FS_CONFIG_GEN instead)

ifneq ($(wildcard $(TARGET_DEVICE_DIR)/android_filesystem_config.h),)

$(error Using $(TARGET_DEVICE_DIR)/android_filesystem_config.h is deprecated, please use TARGET_FS_CONFIG_GEN instead)

endif



my_fs_config_h := $(LOCAL_PATH)/default/$(ANDROID_FS_CONFIG_H)

system_android_filesystem_config := system/core/include/private/android_filesystem_config.h

system_capability_header := bionic/libc/kernel/uapi/linux/capability.h



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

include $(CLEAR_VARS)

LOCAL_SRC_FILES := fs_config_generate.c

LOCAL_MODULE := fs_config_generate_$(TARGET_DEVICE)

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_SHARED_LIBRARIES := libcutils

LOCAL_CFLAGS := -Werror -Wno-error=\#warnings



ifneq ($(TARGET_FS_CONFIG_GEN),)

# Generate the "generated_oem_aid.h" file

oem := $(local-generated-sources-dir)/generated_oem_aid.h

$(oem): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)

$(oem): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(oem): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(oem): PRIVATE_CUSTOM_TOOL = $(PRIVATE_LOCAL_PATH)/fs_config_generator.py oemaid --aid-header=$(PRIVATE_ANDROID_FS_HDR) $(PRIVATE_TARGET_FS_CONFIG_GEN) > $@

$(oem): $(TARGET_FS_CONFIG_GEN) $(LOCAL_PATH)/fs_config_generator.py

	$(transform-generated-source)



# Generate the fs_config header

gen := $(local-generated-sources-dir)/$(ANDROID_FS_CONFIG_H)

$(gen): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)

$(gen): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(gen): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(gen): PRIVATE_CUSTOM_TOOL = $(PRIVATE_LOCAL_PATH)/fs_config_generator.py fsconfig --aid-header=$(PRIVATE_ANDROID_FS_HDR) $(PRIVATE_TARGET_FS_CONFIG_GEN) > $@

$(gen): $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(LOCAL_PATH)/fs_config_generator.py

	$(transform-generated-source)



LOCAL_GENERATED_SOURCES := $(oem) $(gen)



my_fs_config_h := $(gen)

my_gen_oem_aid := $(oem)

gen :=

oem :=

endif



LOCAL_C_INCLUDES := $(dir $(my_fs_config_h)) $(dir $(my_gen_oem_aid))



include $(BUILD_HOST_EXECUTABLE)

fs_config_generate_bin := $(LOCAL_INSTALLED_MODULE)

# List of supported vendor, oem, odm, product and product_services Partitions

fs_config_generate_extra_partition_list := $(strip \

  $(if $(BOARD_USES_VENDORIMAGE)$(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE),vendor) \
@@ -129,12 +89,20 @@ LOCAL_MODULE := fs_config_dirs_system 
LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_PARTITION_LIST := $(fs_config_generate_extra_partition_list)

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -D $(if $(PRIVATE_PARTITION_LIST), \

	   -P '$(subst $(space),$(comma),$(addprefix -,$(PRIVATE_PARTITION_LIST)))') \

	   -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition system \

	   --all-partitions $(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST)) \

	   --dirs \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



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

# Generate the system/etc/fs_config_files binary file for the target
@@ -146,12 +114,20 @@ LOCAL_MODULE := fs_config_files_system 
LOCAL_MODULE_CLASS := ETC

LOCAL_INSTALLED_MODULE_STEM := fs_config_files

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_PARTITION_LIST := $(fs_config_generate_extra_partition_list)

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -F $(if $(PRIVATE_PARTITION_LIST), \

	   -P '$(subst $(space),$(comma),$(addprefix -,$(PRIVATE_PARTITION_LIST)))') \

	   -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition system \

	   --all-partitions $(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST)) \

	   --files \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



ifneq ($(filter vendor,$(fs_config_generate_extra_partition_list)),)

##################################
@@ -165,9 +141,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -D -P vendor -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition vendor \

	   --dirs \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



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

# Generate the vendor/etc/fs_config_files binary file for the target
@@ -180,9 +165,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -F -P vendor -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition vendor \

	   --files \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



endif
@@ -198,9 +192,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -D -P oem -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition oem \

	   --dirs \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



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

# Generate the oem/etc/fs_config_files binary file for the target
@@ -213,9 +216,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -F -P oem -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition oem \

	   --files \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



endif
@@ -231,9 +243,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -D -P odm -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition odm \

	   --dirs \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



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

# Generate the odm/etc/fs_config_files binary file for the target
@@ -246,9 +267,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -F -P odm -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition odm \

	   --files \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



endif
@@ -264,9 +294,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -D -P product -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition product \

	   --dirs \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



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

# Generate the product/etc/fs_config_files binary file for the target
@@ -279,10 +318,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -F -P product -o $@



	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition product \

	   --files \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)

endif



ifneq ($(filter product_services,$(fs_config_generate_extra_partition_list)),)
@@ -297,9 +344,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs

LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_SERVICES)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -D -P product_services -o $@

	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition product_services \

	   --dirs \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)



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

# Generate the product_services/etc/fs_config_files binary file for the target
@@ -312,10 +368,18 @@ LOCAL_MODULE_CLASS := ETC 
LOCAL_INSTALLED_MODULE_STEM := fs_config_files

LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_SERVICES)/etc

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config) $(system_capability_header)

	@mkdir -p $(dir $@)

	$< -F -P product_services -o $@



	$< fsconfig \

	   --aid-header $(PRIVATE_ANDROID_FS_HDR) \

	   --capability-header $(PRIVATE_ANDROID_CAP_HDR) \

	   --partition product_services \

	   --files \

	   --out_file $@ \

	   $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)

endif



##################################
@@ -325,8 +389,21 @@ endif 
ifneq ($(TARGET_FS_CONFIG_GEN),)

include $(CLEAR_VARS)

LOCAL_MODULE := oemaids_headers

LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(my_gen_oem_aid))

LOCAL_EXPORT_C_INCLUDE_DEPS := $(my_gen_oem_aid)



LOCAL_MODULE_CLASS := ETC



# Generate the "generated_oem_aid.h" file

oem := $(local-generated-sources-dir)/generated_oem_aid.h

$(oem): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)

$(oem): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

$(oem): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(oem): PRIVATE_CUSTOM_TOOL = $(PRIVATE_LOCAL_PATH)/fs_config_generator.py oemaid --aid-header=$(PRIVATE_ANDROID_FS_HDR) $(PRIVATE_TARGET_FS_CONFIG_GEN) > $@

$(oem): $(TARGET_FS_CONFIG_GEN) $(LOCAL_PATH)/fs_config_generator.py

	$(transform-generated-source)



LOCAL_EXPORT_C_INCLUDE_DIRS := $(dir $(oem))

LOCAL_EXPORT_C_INCLUDE_DEPS := $(oem)



include $(BUILD_HEADER_LIBRARY)

endif
@@ -342,15 +419,11 @@ LOCAL_VENDOR_MODULE := true 


include $(BUILD_SYSTEM)/base_rules.mk



ifneq ($(TARGET_FS_CONFIG_GEN),)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

else

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := /dev/null

endif

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config)

	@mkdir -p $(dir $@)

	$(hide) $< passwd --required-prefix=vendor_ --aid-header=$(PRIVATE_ANDROID_FS_HDR) $(PRIVATE_TARGET_FS_CONFIG_GEN) > $@

	$(hide) $< passwd --required-prefix=vendor_ --aid-header=$(PRIVATE_ANDROID_FS_HDR) $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null) > $@



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

# Generate the vendor/etc/group text file for the target
@@ -364,20 +437,12 @@ LOCAL_VENDOR_MODULE := true 


include $(BUILD_SYSTEM)/base_rules.mk



ifneq ($(TARGET_FS_CONFIG_GEN),)

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)

else

$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := /dev/null

endif

$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(system_android_filesystem_config)

	@mkdir -p $(dir $@)

	$(hide) $< group --required-prefix=vendor_ --aid-header=$(PRIVATE_ANDROID_FS_HDR) $(PRIVATE_TARGET_FS_CONFIG_GEN) > $@

	$(hide) $< group --required-prefix=vendor_ --aid-header=$(PRIVATE_ANDROID_FS_HDR) $(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null) > $@



system_android_filesystem_config :=



ANDROID_FS_CONFIG_H :=

my_fs_config_h :=

fs_config_generate_bin :=

my_gen_oem_aid :=

system_capability_header :=

fs_config_generate_extra_partition_list :=

tools/fs_config/android_filesystem_config_test_data.h

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <private/android_filesystem_config.h>



/* Test Data */



#undef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS

#undef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_FILES



static const struct fs_path_config android_device_dirs[] = {

    {00555, AID_ROOT, AID_SYSTEM, 0, "system/etc"},

    {00555, AID_ROOT, AID_SYSTEM, 0, "vendor/etc"},

    {00555, AID_ROOT, AID_SYSTEM, 0, "oem/etc"},

    {00555, AID_ROOT, AID_SYSTEM, 0, "odm/etc"},

    {00555, AID_ROOT, AID_SYSTEM, 0, "product/etc"},

    {00555, AID_ROOT, AID_SYSTEM, 0, "product_services/etc"},

    {00755, AID_SYSTEM, AID_ROOT, 0, "system/oem/etc"},

    {00755, AID_SYSTEM, AID_ROOT, 0, "system/odm/etc"},

    {00755, AID_SYSTEM, AID_ROOT, 0, "system/vendor/etc"},

    {00755, AID_SYSTEM, AID_ROOT, 0, "data/misc"},

    {00755, AID_SYSTEM, AID_ROOT, 0, "oem/data/misc"},

    {00755, AID_SYSTEM, AID_ROOT, 0, "odm/data/misc"},

    {00755, AID_SYSTEM, AID_ROOT, 0, "vendor/data/misc"},

    {00555, AID_SYSTEM, AID_ROOT, 0, "etc"},

};



static const struct fs_path_config android_device_files[] = {

    {00444, AID_ROOT, AID_SYSTEM, 0, "system/etc/fs_config_dirs"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "vendor/etc/fs_config_dirs"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "oem/etc/fs_config_dirs"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "odm/etc/fs_config_dirs"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "product/etc/fs_config_dirs"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "product_services/etc/fs_config_dirs"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "system/etc/fs_config_files"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "vendor/etc/fs_config_files"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "oem/etc/fs_config_files"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "odm/etc/fs_config_files"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "product/etc/fs_config_files"},

    {00444, AID_ROOT, AID_SYSTEM, 0, "product_services/etc/fs_config_files"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "system/vendor/etc/fs_config_dirs"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "system/oem/etc/fs_config_dirs"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "system/odm/etc/fs_config_dirs"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "system/vendor/etc/fs_config_files"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "system/oem/etc/fs_config_files"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "system/odm/etc/fs_config_files"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "system/product/etc/fs_config_files"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "system/product_services/etc/fs_config_files"},

    {00644, AID_SYSTEM, AID_ROOT, 0, "etc/fs_config_files"},

    {00666, AID_ROOT, AID_SYSTEM, 0, "data/misc/oem"},

};

tools/fs_config/default/android_filesystem_config.h

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



/* This file is used to enhance the properties of the filesystem

** images generated by build tools (mkbootfs and mkyaffs2image) and

** by the device side of adb.

*/



/* Rules for directories.

** These rules are applied based on "first match", so they

** should start with the most specific path and work their

** way up to the root.

*/



#define NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS 1 /* opt out of specifying */



/* Rules for files.

** These rules are applied based on "first match", so they

** should start with the most specific path and work their

** way up to the root. Prefixes ending in * denotes wildcard

** and will allow partial matches.

*/



#define NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_FILES 1 /* opt out of specifying */

tools/fs_config/end_to_end_test/config.fs

0 → 100644
+108 −0
Original line number Diff line number Diff line 
# Copyright (C) 2018 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



# This file is used to define the properties of the filesystem

# images generated by build tools (mkbootfs and mkyaffs2image) and

# by the device side of adb.



[AID_VENDOR_NEW_SERVICE]

value: 2900



[AID_VENDOR_NEW_SERVICE_TWO]

value:2902



[vendor/bin/service1]

mode: 0755

user: AID_SYSTEM

group: AID_VENDOR_NEW_SERVICE

caps: CHOWN DAC_OVERRIDE



[vendor/bin/service2]

mode: 0755

user: AID_VENDOR_NEW_SERVICE_TWO

group: AID_SYSTEM

caps: AUDIT_READ CHOWN SYS_ADMIN



[system/vendor/bin/service3]

mode: 0755

user: AID_SYSTEM

group: AID_SYSTEM

caps: AUDIT_READ CHOWN SYS_ADMIN



[vendor/dir/]

mode: 0755

user: AID_VENDOR_NEW_SERVICE_TWO

group: AID_SYSTEM

caps: 0



[system/vendor/dir2/]

mode: 0755

user: AID_VENDOR_NEW_SERVICE_TWO

group: AID_SYSTEM

caps: 0



[product/bin/service1]

mode: 0755

user: AID_SYSTEM

group: AID_SYSTEM

caps: 0x34



[product/bin/service2]

mode: 0755

user: AID_SYSTEM

group: AID_SYSTEM

caps: NET_BIND_SERVICE WAKE_ALARM



[system/product/bin/service3]

mode: 0755

user: AID_SYSTEM

group: AID_SYSTEM

caps: NET_BIND_SERVICE WAKE_ALARM



[product/dir/]

mode: 0755

user: AID_SYSTEM

group: AID_SYSTEM

caps: 0



[system/product/dir/]

mode: 0755

user: AID_SYSTEM

group: AID_SYSTEM

caps: 0



[system/bin/service]

mode: 0755

user: AID_SYSTEM

group: AID_RADIO

caps: NET_BIND_SERVICE



[system/dir/]

mode: 0755

user: AID_SYSTEM

group: AID_RADIO

caps: 0



[root_file]

mode: 0755

user: AID_SYSTEM

group: AID_RADIO

caps: 0



[root_dir/]

mode: 0755

user: AID_SYSTEM

group: AID_RADIO

caps: 0