p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement 

When configuring fs_config_files or fs_config_dirs for file_system
capabilities, drop the requirement that OEMs must add the target
to PRODUCT_PACKAGES. This limits the configuration requirement
to only needing to set the new and preferred TARGET_FS_CONFIG_GEN
or the older TARGET_ANDROID_FILESYSTEM_CONFIG_H method.

Test: That only setting TARGET_FS_CONFIG_GEN results in passwd and
group in the build image.
Change-Id: I818854fa1b3e94edaff59a32bd7cf23cf9b504aa
Signed-off-by: William Roberts <william.c.roberts@intel.com>
This commit is contained in:
William Roberts 2016-04-27 16:16:02 -07:00 committed by Dan Albert
parent 2127b35526
commit 7fe8b6d817
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/embedded.mk
View File

@ -91,7 +91,9 @@ PRODUCT_PACKAGES += \
# <pwd.h> and <grp.h>
PRODUCT_PACKAGES += \
passwd \
group
group \
fs_config_files \
fs_config_dirs
# Ensure that this property is always defined so that bionic_systrace.cpp
# can rely on it being initially set by init.

17
tools/fs_config/Android.mk
View File

@ -72,6 +72,19 @@ else
my_fs_config_h := $(LOCAL_PATH)/default/$(ANDROID_FS_CONFIG_H)
endif
# We only include targets for:
# fs_config_files
# fs_config_dirs
# If TARGET_FS_CONFIG_GEN or TARGET_ANDROID_FILESYSTEM_CONFIG_H
# is set.
#
# We only include targets for:
# passwd
# group
# If TARGET_FS_CONFIG_GEN is set.
#
ifneq ($(TARGET_FS_CONFIG_GEN)$(TARGET_ANDROID_FILESYSTEM_CONFIG_H),)
##################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := fs_config_generate.c
@ -138,6 +151,10 @@ $(LOCAL_BUILT_MODULE): $(fs_config_generate_bin)
@mkdir -p $(dir $@)
$< -F -o $@
endif # TARGET_FS_CONFIG_GEN or TARGET_ANDROID_FILESYSTEM_CONFIG_H
# The newer passwd/group targets are only generated if you
# use the new TARGET_FS_CONFIG_GEN method.
ifneq ($(TARGET_FS_CONFIG_GEN),)
##################################

6
tools/fs_config/README
View File

@ -50,12 +50,12 @@ mode:
prefixed with a 0, else mode is used as is.
user:
The exact, C define for a valid AID. Note custom AIDs can be defined in the
Either the C define for a valid AID or the friendly name. For instance both
AID_RADIO and radio are acceptable. Note custom AIDs can be defined in the
AID section documented below.
group:
The exact, C define for a valid AID. Note custom AIDs can be defined in the
AID section documented below.
Same as user.
caps:
The name as declared in

7
tools/fs_config/default/android_filesystem_config.h
View File

@ -19,13 +19,6 @@
** by the device side of adb.
*/
/*
** Resorting to the default file means someone requested fs_config_dirs or
** fs_config_files in their device configuration without providing an
** associated header.
*/
#warning No device-supplied android_filesystem_config.h, using empty default.
/* Rules for directories.
** These rules are applied based on "first match", so they
** should start with the most specific path and work their