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

Commit ee9af6ed authored by William Roberts's avatar William Roberts Committed by android-build-merger
Browse files

fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement

am: 7fe8b6d8

Change-Id: Ie209bc0f1696ffdc5f167d229fc9f5378f8feb24
parents bdbafb5c 7fe8b6d8
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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),)

##################################
+3 −3
Original line number Diff line number Diff line
@@ -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
+0 −7
Original line number Diff line number Diff line
@@ -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