tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/tools/fs_config/Android.mk

678 lines
29 KiB
Makefile
Raw Normal View History

auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
# Copyright (C) 2008 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.
LOCAL_PATH := $(call my-dir)
fs_config: use libcutils and libselinux shared libraries - move to libcutils.so and libselinux.so as shared now that they are in DISTTOOL. - liblog dependency is part of libcutils, and need not be called out explicitly now. liblog is in DISTTOOL. - libcutils fs_config has the right to add Android logging Bug: 19908228 Change-Id: Iaa60ad624b42d83653840ac3c77bfa03ad8674aa
2015-04-15 21:53:39 +02:00
Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H TARGET_FS_CONFIG_GEN has existed as the preferred mechanism for two releases, so we finally deprecate TARGET_ANDROID_FILESYSTEM_CONFIG_H. Test: build Change-Id: I299a4d1d1d893ac16d6e6ce2ec4659bfcdc19095
2019-02-11 22:09:59 +01:00
# One can override the default android_filesystem_config.h file by using TARGET_FS_CONFIG_GEN.
# Set TARGET_FS_CONFIG_GEN to contain a list of intermediate format files
fs_config: introduce TARGET_FS_CONFIG_GEN Introduce TARGET_FS_CONFIG_GEN, an option for generating android_filesystem_config.h files from multiple intermediate file formats. See the README for more details. Change-Id: Ibdb2f65702657802e34b0cec18fb43709d7452bb Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-03-05 03:12:29 +01:00
# for generating the android_filesystem_config.h file.
#
# More information can be found in the README
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
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
2019-02-13 23:02:30 +01:00
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)
Error if $(TARGET_DEVICE_DIR)/android_filesystem_config.h exists This was deprecated along with TARGET_ANDROID_FILESYSTEM_CONFIG_H so warn if it still exists. Test: successful error if it exists, no error if it does not Change-Id: I7dde3c88aaf7ecec23ffe018cbe8b42ebadb2bf8
2019-02-14 01:17:39 +01:00
endif
Use libcutils_headers for android_filesystem_config.h android_filesystem_config.h is found since system/core/include is on the include path for all projects and contains a symlink to the real android_filesystem_config.h. This is fragile and the below bug seeks to remove this symlink and have users correctly depend on libcutils_headers. Bug: 165825252 Test: build Change-Id: Ie921c4fd96d6e4e42d127bfbfe7a892756ad9495
2020-09-17 18:42:55 +02:00
system_android_filesystem_config := system/core/libcutils/include/private/android_filesystem_config.h
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
2019-02-13 23:02:30 +01:00
system_capability_header := bionic/libc/kernel/uapi/linux/capability.h
Always create /vendor/etc/{passwd,group} Previously we only created these if the device set TARGET_FS_CONFIG_GEN, however there are now other targets that want to depend on these. Instead of having those targets conditionally depend on them, we always create them, defaulting to blank contents (by reading /dev/null for TARGET_FS_CONFIG_GEN). Test: builds succeed Change-Id: Ie95286f5a800d891022eb66cd6fefcc967000c2e
2018-06-14 21:19:19 +02:00
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
# Use snapshots if exist
vendor_android_filesystem_config := $(strip \
$(if $(filter-out current,$(BOARD_VNDK_VERSION)), \
$(SOONG_VENDOR_$(BOARD_VNDK_VERSION)_SNAPSHOT_DIR)/include/$(system_android_filesystem_config)))
ifeq (,$(wildcard $(vendor_android_filesystem_config)))
vendor_android_filesystem_config := $(system_android_filesystem_config)
endif
vendor_capability_header := $(strip \
$(if $(filter-out current,$(BOARD_VNDK_VERSION)), \
$(SOONG_VENDOR_$(BOARD_VNDK_VERSION)_SNAPSHOT_DIR)/include/$(system_capability_header)))
ifeq (,$(wildcard $(vendor_capability_header)))
vendor_capability_header := $(system_capability_header)
endif
core & tools: system_dlkm: add dynamic partition Converts existing static partition support to a dynamic partition. Bug: 200082547 Test: TH Signed-off-by: Ramji Jiyani <ramjiyani@google.com> Change-Id: Ifd6d0c2a04e947b16f8b241e99cca594a1d315ae
2022-01-27 08:05:08 +01:00
# List of supported vendor, oem, odm, vendor_dlkm, odm_dlkm, and system_dlkm Partitions
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
fs_config_generate_extra_partition_list := $(strip \
$(if $(BOARD_USES_VENDORIMAGE)$(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE),vendor) \
$(if $(BOARD_USES_OEMIMAGE)$(BOARD_OEMIMAGE_FILE_SYSTEM_TYPE),oem) \
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
$(if $(BOARD_USES_ODMIMAGE)$(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE),odm) \
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
$(if $(BOARD_USES_VENDOR_DLKMIMAGE)$(BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE),vendor_dlkm) \
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
$(if $(BOARD_USES_ODM_DLKMIMAGE)$(BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE),odm_dlkm) \
core & tools: system_dlkm: add dynamic partition Converts existing static partition support to a dynamic partition. Bug: 200082547 Test: TH Signed-off-by: Ramji Jiyani <ramjiyani@google.com> Change-Id: Ifd6d0c2a04e947b16f8b241e99cca594a1d315ae
2022-01-27 08:05:08 +01:00
$(if $(BOARD_USES_SYSTEM_DLKMIMAGE)$(BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE),system_dlkm) \
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
)
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
fs_config: introduce TARGET_FS_CONFIG_GEN Introduce TARGET_FS_CONFIG_GEN, an option for generating android_filesystem_config.h files from multiple intermediate file formats. See the README for more details. Change-Id: Ibdb2f65702657802e34b0cec18fb43709d7452bb Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-03-05 03:12:29 +01:00
##################################
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
2018-06-26 15:03:38 +02:00
# 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.
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_dirs
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
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
2018-06-26 15:03:38 +02:00
LOCAL_REQUIRED_MODULES := \
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
fs_config_dirs_system \
fs_config_dirs_system_ext \
fs_config_dirs_product \
fs_config_dirs_nonsystem
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
2018-06-26 15:03:38 +02:00
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
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
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
2018-06-26 15:03:38 +02:00
LOCAL_REQUIRED_MODULES := \
fs_config_files_system \
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
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
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
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
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
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
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
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
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_REQUIRED_MODULES := $(if $(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),_fs_config_files_product)
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
2018-06-26 15:03:38 +02:00
include $(BUILD_PHONY_PACKAGE)
##################################
# Generate the <p>/etc/fs_config_dirs binary files for all enabled partitions
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# excluding /system, /system_ext and /product. Add fs_config_dirs_nonsystem to
# PRODUCT_PACKAGES in the device make file to enable.
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
2018-06-26 15:03:38 +02:00
include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_dirs_nonsystem
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),_fs_config_dirs_$(t))
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
2018-06-26 15:03:38 +02:00
include $(BUILD_PHONY_PACKAGE)
##################################
# Generate the <p>/etc/fs_config_files binary files for all enabled partitions
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# excluding /system, /system_ext and /product. Add fs_config_files_nonsystem to
# PRODUCT_PACKAGES in the device make file to enable.
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
2018-06-26 15:03:38 +02:00
include $(CLEAR_VARS)
LOCAL_MODULE := fs_config_files_nonsystem
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_REQUIRED_MODULES := $(foreach t,$(fs_config_generate_extra_partition_list),_fs_config_files_$(t))
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
2018-06-26 15:03:38 +02:00
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
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
LOCAL_MODULE_CLASS := ETC
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
2018-06-26 15:03:38 +02:00
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
include $(BUILD_SYSTEM)/base_rules.mk
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
2019-02-13 23:02:30 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)
fs_config: fix fs_config_*_system targets Content from fs_config designated for other partitions is leaking into the system fs_config_* files. Notably /vendor is showing up. Rule expansion happens late, after all parsing. This is the same in make and kati. build/make/tools/fs_config/Android.mk ends with fs_config_generate_extra_partition_list :=, so by the time you get to rule expansion the value is empty. Added a PRIVATE_PARTITION_LIST variable to record the value of fs_config_generate_extra_partition-list. Test: inspect result of ${OUT}/product/*/system/etc/fs_config_files Bug: 119677224 Bug: 119310326 Change-Id: I968b4936ab2c5d174f164c760820af13434654ca
2018-11-16 22:30:37 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_PARTITION_LIST := $(fs_config_generate_extra_partition_list)
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
2019-02-13 23:02:30 +01:00
$(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)
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition system \
fs_config: Fix cases without vendor/oem partition If the device has neither an OEM nor a vendor partiton, $PRIVATE_PARTITION_LIST will be empty, causing the fsconfig tool to fail because the "--all-partitions" argument will be empty. Quote the comma-substituted "$(PRIVATE_PARTITION_LIST)" - which may be empty - to appease argparse, which will then populate "_all_partitions" with an empty "str" object. Checking _all_partitions against None is superfluous since either argparse will catch the empty argument and fail early, or the argument will be a string, in which case it will not be None. Signed-off-by: Felix <google@ix5.org> Change-Id: I236e30445b303b4945467b5dc4387d54b5d984f9
2019-05-26 12:09:50 +02:00
--all-partitions "$(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST))" \
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
2019-02-13 23:02:30 +01:00
--dirs \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
fs_config: introduce TARGET_FS_CONFIG_GEN Introduce TARGET_FS_CONFIG_GEN, an option for generating android_filesystem_config.h files from multiple intermediate file formats. See the README for more details. Change-Id: Ibdb2f65702657802e34b0cec18fb43709d7452bb Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-03-05 03:12:29 +01:00
##################################
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
# Generate the system/etc/fs_config_files binary file for the target
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
2018-06-26 15:03:38 +02:00
# Add fs_config_files or fs_config_files_system to PRODUCT_PACKAGES in
# the device make file to enable
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
include $(CLEAR_VARS)
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
2018-06-26 15:03:38 +02:00
LOCAL_MODULE := fs_config_files_system
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
LOCAL_MODULE_CLASS := ETC
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
2018-06-26 15:03:38 +02:00
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
include $(BUILD_SYSTEM)/base_rules.mk
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
2019-02-13 23:02:30 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(system_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(system_capability_header)
fs_config: fix fs_config_*_system targets Content from fs_config designated for other partitions is leaking into the system fs_config_* files. Notably /vendor is showing up. Rule expansion happens late, after all parsing. This is the same in make and kati. build/make/tools/fs_config/Android.mk ends with fs_config_generate_extra_partition_list :=, so by the time you get to rule expansion the value is empty. Added a PRIVATE_PARTITION_LIST variable to record the value of fs_config_generate_extra_partition-list. Test: inspect result of ${OUT}/product/*/system/etc/fs_config_files Bug: 119677224 Bug: 119310326 Change-Id: I968b4936ab2c5d174f164c760820af13434654ca
2018-11-16 22:30:37 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_PARTITION_LIST := $(fs_config_generate_extra_partition_list)
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
2019-02-13 23:02:30 +01:00
$(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)
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition system \
fs_config: Fix cases without vendor/oem partition If the device has neither an OEM nor a vendor partiton, $PRIVATE_PARTITION_LIST will be empty, causing the fsconfig tool to fail because the "--all-partitions" argument will be empty. Quote the comma-substituted "$(PRIVATE_PARTITION_LIST)" - which may be empty - to appease argparse, which will then populate "_all_partitions" with an empty "str" object. Checking _all_partitions against None is superfluous since either argparse will catch the empty argument and fail early, or the argument will be a string, in which case it will not be None. Signed-off-by: Felix <google@ix5.org> Change-Id: I236e30445b303b4945467b5dc4387d54b5d984f9
2019-05-26 12:09:50 +02:00
--all-partitions "$(subst $(space),$(comma),$(PRIVATE_PARTITION_LIST))" \
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
2019-02-13 23:02:30 +01:00
--files \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
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|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES
# in the device make file to enable
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_dirs_vendor
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
include $(BUILD_SYSTEM)/base_rules.mk
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_capability_header)
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
2019-02-13 23:02:30 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(vendor_android_filesystem_config) $(vendor_capability_header)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< 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)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
##################################
# Generate the vendor/etc/fs_config_files binary file for the target
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES
# in the device make file to enable
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_files_vendor
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
include $(BUILD_SYSTEM)/base_rules.mk
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_capability_header)
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
2019-02-13 23:02:30 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(vendor_android_filesystem_config) $(vendor_capability_header)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< 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)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
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|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES
# in the device make file to enable
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_dirs_oem
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
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
2019-02-13 23:02:30 +01:00
$(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)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< 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)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
##################################
# Generate the oem/etc/fs_config_files binary file for the target
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES
# in the device make file to enable
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_files_oem
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
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
2019-02-13 23:02:30 +01:00
$(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)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< 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)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
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|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES
# in the device make file to enable
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_dirs_odm
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_capability_header)
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
2019-02-13 23:02:30 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(vendor_android_filesystem_config) $(vendor_capability_header)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< 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)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
##################################
# Generate the odm/etc/fs_config_files binary file for the target
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES
# in the device make file to enable
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_files_odm
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_ODM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_capability_header)
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
2019-02-13 23:02:30 +01:00
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(vendor_android_filesystem_config) $(vendor_capability_header)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< 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)
fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm) Add build targets to generate the vendor, oem and odm slices of the fs_config_dirs and fs_config_files targets for each of the respective filesystems, and automatically trigger the individual and enabled partition build objects based as dependents of fs_config_dirs and fs_config_files. Sensitive to the following board definition pairs: BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE BOARD_USES_VENDORIMAGE BOARD_OEMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_OEMIMAGE BOARD_ODMIMAGE_FILE_SYSTEM_TYPE BOARD_USES_ODMIMAGE Which when defined and set means the images are generated for vendor, oem or odm respectively. Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)' and check the expected products, or fails if not pertinent. Test: build for product that produces split to system and vendor and subsequently boots with vendor products correctly configured. Bug: 36071012 Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-03-22 23:53:12 +01:00
endif
fs_config: Add fs_config_generate fs_config_generate_$(TARGET_DEVICE) is built based off the content of $(TARGET_ANDROID_FILESYSTEM_CONFIG_H). We also add the rules fs_config_dirs and fs_config_file to utilize this command for target contents: fs_config_generate_$(TARGET_DEVICE) -D -o system/etc/fs_config_dir fs_config_generate_$(TARGET_DEVICE) -F -o system/etc/fs_config_file In order to use this feature, one must have the fs_config_dirs and fs_config_files in the $(PRODUCT_PACKAGES) list defined in the device make files in $(TARGET_DEVICE_DIR). And either an android_filesystem_config.h file in that directory, or define a path in TARGET_ANDROID_FILESYSTEM_CONFIG_H to point to one. Bug: 19908228 Change-Id: Iee1543d99169f874e0915ae07962a7750ecb6342
2015-04-01 23:41:29 +02:00
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
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|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES in
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
# the device make file to enable
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_dirs_vendor_dlkm
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_DLKM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_capability_header)
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(vendor_android_filesystem_config) $(vendor_capability_header)
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
@mkdir -p $(dir $@)
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition vendor_dlkm \
--dirs \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
##################################
# Generate the vendor_dlkm/etc/fs_config_files binary file for the target
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES in
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
# the device make file to enable
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_files_vendor_dlkm
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_DLKM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_capability_header)
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(vendor_android_filesystem_config) $(vendor_capability_header)
Add vendor_dlkm partition. Test: define vendor_dlkm for CF. Bug: 156020364 Change-Id: I459059e1c20df7a285a377b8b3bbc8decc60b124
2020-05-07 23:58:20 +02:00
@mkdir -p $(dir $@)
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition vendor_dlkm \
--files \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
endif
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
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|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_dirs or fs_config_dirs_nonsystem to PRODUCT_PACKAGES
# in the device make file to enable
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_dirs_odm_dlkm
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_ODM_DLKM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_capability_header)
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(vendor_android_filesystem_config) $(vendor_capability_header)
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
@mkdir -p $(dir $@)
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition odm_dlkm \
--dirs \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
##################################
# Generate the odm_dlkm/etc/fs_config_files binary file for the target
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_files or fs_config_files_nonsystem to PRODUCT_PACKAGES
# in the device make file to enable
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_files_odm_dlkm
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_ODM_DLKM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_capability_header)
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
$(LOCAL_BUILT_MODULE): PRIVATE_TARGET_FS_CONFIG_GEN := $(TARGET_FS_CONFIG_GEN)
fs_config reads headers from snapshots, if available fs_config requires the information from the header files in system/core and bionic/libc. To build the vendor side fs_config, use the header files in the vendor snashot if the required version exists. Bug: 187222756 Test: check ninja depedency with and without snasphots. Change-Id: Ibf96eab4d9a129745be1a19b2aa2e4c8f57cf6bf
2021-07-13 04:42:18 +02:00
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/fs_config_generator.py $(TARGET_FS_CONFIG_GEN) $(vendor_android_filesystem_config) $(vendor_capability_header)
Add odm_dlkm partition. Test: define odm_dlkm in CF. Bug: 156020364 Change-Id: I5593d09a1cdf13e651a13e951336555a7475865e
2020-07-16 01:52:59 +02:00
@mkdir -p $(dir $@)
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition odm_dlkm \
--files \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
endif
core & tools: system_dlkm: add dynamic partition Converts existing static partition support to a dynamic partition. Bug: 200082547 Test: TH Signed-off-by: Ramji Jiyani <ramjiyani@google.com> Change-Id: Ifd6d0c2a04e947b16f8b241e99cca594a1d315ae
2022-01-27 08:05:08 +01:00
ifneq ($(filter system_dlkm,$(fs_config_generate_extra_partition_list)),)
##################################
# Generate the system_dlkm/etc/fs_config_dirs binary file for the target
# 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_system_dlkm
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_DLKM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_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) $(vendor_android_filesystem_config) $(vendor_capability_header)
@mkdir -p $(dir $@)
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition system_dlkm \
--dirs \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
##################################
# Generate the system_dlkm/etc/fs_config_files binary file for the target
# 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_system_dlkm
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_DLKM)/etc
include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_FS_HDR := $(vendor_android_filesystem_config)
$(LOCAL_BUILT_MODULE): PRIVATE_ANDROID_CAP_HDR := $(vendor_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) $(vendor_android_filesystem_config) $(vendor_capability_header)
@mkdir -p $(dir $@)
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
--partition system_dlkm \
--files \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
endif
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
ifneq ($(BOARD_USES_PRODUCTIMAGE)$(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE),)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
##################################
# 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)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_dirs_product
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc
include $(BUILD_SYSTEM)/base_rules.mk
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
2019-02-13 23:02:30 +01:00
$(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)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< 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)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
##################################
# Generate the product/etc/fs_config_files binary file for the target
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_files or fs_config_files_product to PRODUCT_PACKAGES in
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
# the device make file to enable
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_files_product
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/etc
include $(BUILD_SYSTEM)/base_rules.mk
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
2019-02-13 23:02:30 +01:00
$(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)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< 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)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
endif
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
ifneq ($(BOARD_USES_SYSTEM_EXTIMAGE)$(BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE),)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
##################################
Rename product_services to system_ext Bug: 134359158 Test: build and check if system_ext.img is created Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-06-25 08:58:13 +02:00
# 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
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
# the device make file to enable
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_dirs_system_ext
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_dirs
Rename product_services to system_ext Bug: 134359158 Test: build and check if system_ext.img is created Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-06-25 08:58:13 +02:00
LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT)/etc
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
include $(BUILD_SYSTEM)/base_rules.mk
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
2019-02-13 23:02:30 +01:00
$(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)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
Rename product_services to system_ext Bug: 134359158 Test: build and check if system_ext.img is created Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-06-25 08:58:13 +02:00
--partition system_ext \
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
2019-02-13 23:02:30 +01:00
--dirs \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
##################################
Rename product_services to system_ext Bug: 134359158 Test: build and check if system_ext.img is created Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-06-25 08:58:13 +02:00
# Generate the system_ext/etc/fs_config_files binary file for the target
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
# Add fs_config_files or fs_config_files_system_ext to PRODUCT_PACKAGES in
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
# the device make file to enable
include $(CLEAR_VARS)
Add fs_config_(dirs|files) for product and system_ext These files were added to devices with the fs_config_files_nonsystem module in base_vendor.mk. As they are partition-specific, move them to each base_<partition>.mk file. To add the fs_config_* files to the base_<partition>.mk files, it is required to define the fs_config_* regardless of the existance of partitions. Bug: 170282998 Test: build and check if they are installed. Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-19 09:58:06 +02:00
LOCAL_MODULE := _fs_config_files_system_ext
Fix licenses and license texts. Use Android-Apache-2.0 for all Apache 2.0 Remove legacy_restricted (no longer appears in code). Remove Android.bp which did not build anything but was a placeholder for the missing license texts. Test: m nothing Change-Id: Ia491a59c735ca20afda9b4bbac9d8b33dbf8874e
2022-01-25 00:21:32 +01:00
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
LOCAL_MODULE_CLASS := ETC
LOCAL_INSTALLED_MODULE_STEM := fs_config_files
Rename product_services to system_ext Bug: 134359158 Test: build and check if system_ext.img is created Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-06-25 08:58:13 +02:00
LOCAL_MODULE_PATH := $(TARGET_OUT_SYSTEM_EXT)/etc
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
include $(BUILD_SYSTEM)/base_rules.mk
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
2019-02-13 23:02:30 +01:00
$(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)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
@mkdir -p $(dir $@)
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
2019-02-13 23:02:30 +01:00
$< fsconfig \
--aid-header $(PRIVATE_ANDROID_FS_HDR) \
--capability-header $(PRIVATE_ANDROID_CAP_HDR) \
Rename product_services to system_ext Bug: 134359158 Test: build and check if system_ext.img is created Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-06-25 08:58:13 +02:00
--partition system_ext \
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
2019-02-13 23:02:30 +01:00
--files \
--out_file $@ \
$(or $(PRIVATE_TARGET_FS_CONFIG_GEN),/dev/null)
fs_config: add product and product_services Mechanical extension of mount directories to also support product/ and product_services/ as individually supplied images. NB: In the distant past, a prototype placing the make rules into a macro was rejected as too difficult to maintain within the macro rules, so rules are rolled-out to make them easy to understand. Test: compile Bug: 119310326 Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-11-16 18:44:07 +01:00
endif
Revert "Revert "Merge changes from topic 'fsconfig-2'"" This reverts commit fad4b4b715be25e874829345a14219716fc8c157. Incorporating the following fixes: 1. fsconfig: fix fs_config_* build for discovered headers When android_file system_config.h is picked up from the device directory, neither TARGET_FS_CONFIG_GEN or TARGET_ANDROID_FILESYSTEM_CONFIG_H are specified. Thus, the build is not generating the required fs_config_files and fs_config_dirs. Test: Ensure that make fs_config_files works, and produces the same output as before Build the system image and mount it as a loop back and dump the file system capabilities with getcap. Verify that output to the supplied android_file system_config.h From the loopback of the system.img mount, from CWD system/bin: $ getcap * cnss-daemon = cap_net_bind_service+ep hostapd = cap_net_admin,cap_net_raw+ep imsdatadaemon = cap_net_bind_service+ep ims_rtp_daemon = cap_net_bind_service+ep logd = cap_setgid,cap_audit_control,cap_syslog+ep mm-qcamera-daemon = cap_sys_nice+ep pm-service = cap_net_bind_service+ep run-as = cap_setgid,cap_setuid+ep surfaceflinger = cap_sys_nice+ep webview_zygote32 = cap_setgid,cap_setuid,cap_setpcap+ep webview_zygote64 = cap_setgid,cap_setuid,cap_setpcap+ep Compared to the android_filesystem_config.h: { 00700, AID_CAMERA, AID_SHELL, (1ULL << CAP_SYS_NICE), "system/bin/mm-qcamera-daemon" }, { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/pm-service" }, { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/imsdatadaemon" }, { 00755, AID_SYSTEM, AID_RADIO, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/ims_rtp_daemon" }, { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/cnss-daemon"}, 2. fsconfig: fix error message for duplicate AID Fixes: raise ValueError('Duplicate aid value "%u" for %s' % value, TypeError: %u format: a number is required, not str and raise ValueError('Duplicate aid value "%s" for %s' % value, TypeError: not enough arguments for format string 3. fsconfig: add test for duplicate ranges Add a test for duplicate range detection. 4. fsconfig: skip AID_APP, AID_USER and all ranges Do not output AID_APP, AID_USER and ranges. A range is defined as ending with AID_ and ending in _START or _END. 5. fsconfig: test for skip AID_APP, AID_USER and all ranges Test against AIDs that caused the bionic tests to fail. Change-Id: I95569a9ccc83bd3231f8a6f395532cc2de316bd2 Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-12-14 00:37:07 +01:00
system_android_filesystem_config :=
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
2019-02-13 23:02:30 +01:00
system_capability_header :=
Android.mk: clear variable at end of use Clear fs_config_generate_extra_partition_list after use. Test: build fs_config_files and fs_config_dirs targets. Change-Id: Ie18bcd2df2ff1becb178e9ba45d226e2e9a8faab Signed-off-by: William Roberts <william.c.roberts@intel.com>
2017-05-15 20:02:53 +02:00
fs_config_generate_extra_partition_list :=
Reference in a new issue Copy permalink