TARGET_FS_CONFIG_GEN: switch from android_filesystem_config.handroid-wear-n-preview-3android-wear-n-preview-1android-n-preview-3android-n-preview-2

Use TARGET_FS_CONFIG_GEN and switch from using android_filesystem_config.h.

BEFORE:
$ md5sum out/target/product/shamu/system/etc/fs_config_files
0be50bbc55a524a0b766c6cf561f8607  out/target/product/shamu/system/etc/fs_config_files

$ ls -laZ out/target/product/shamu/system/etc/fs_config_files
-rw-rw-r-- 1 wcrobert wcrobert ? 88 Mar  4 19:39 out/target/product/shamu/system/etc/fs_config_files

AFTER:

$ md5sum out/target/product/shamu/system/etc/fs_config_files
0be50bbc55a524a0b766c6cf561f8607  out/target/product/shamu/system/etc/fs_config_files

$ ls -laZ out/target/product/shamu/system/etc/fs_config_files
-rw-rw-r-- 1 wcrobert wcrobert ? 88 Mar  4 19:50 out/target/product/shamu/system/etc/fs_config_files

Change-Id: I66cfdf45960eb2e56e1333bdab5677c412c5ded3
Signed-off-by: William Roberts <william.c.roberts@intel.com>

3 files changed, 7 insertions, 38 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index f3c12012..31cb4cba 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -136,4 +136,6 @@ EXTENDED_FONT_FOOTPRINT := true
 
 USE_CLANG_PLATFORM_BUILD := true
 
+TARGET_FS_CONFIG_GEN += device/moto/shamu/config.fs
+
 -include vendor/moto/shamu/BoardConfigVendor.mk
diff --git a/android_filesystem_config.h b/android_filesystem_config.h
deleted file mode 100644
index b21ad101..00000000
--- a/android_filesystem_config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* This file is used to define the properties of the filesystem
-** images generated by build tools (mkbootfs and mkyaffs2image) and
-** by the device side of adb.
-*/
-
-#include <private/android_filesystem_config.h>
-
-#define NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
-/* static const struct fs_path_config android_device_dirs[] = { }; */
-
-/* Rules for files.
-** These rules are applied based on "first match", so they
-** should start with the most specific path and work their
-** way up to the root. Prefixes ending in * denotes wildcard
-** and will allow partial matches.
-*/
-static const struct fs_path_config android_device_files[] = {
-    { 00700, AID_RADIO,     AID_SHELL,     (1ULL << CAP_BLOCK_SUSPEND), "system/bin/qmuxd" },
-#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
-    { 00000, AID_ROOT,      AID_ROOT,      0, "system/etc/fs_config_dirs" },
-#endif
-};
diff --git a/config.fs b/config.fs
new file mode 100644
index 00000000..15679d26
--- /dev/null
+++ b/config.fs
@@ -0,0 +1,5 @@
+[system/bin/qmuxd]
+mode: 0700
+user: AID_RADIO
+group: AID_SHELL
+caps: BLOCK_SUSPEND