Merge "TARGET_FS_CONFIG_GEN: switch from android_filesystem_config.h"
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b612d92..a9b6d92 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -73,6 +73,8 @@
#TARGET_SUPPORTS_64_BIT_APPS := true
+TARGET_FS_CONFIG_GEN += device/google/dragon/config.fs
+
# Bluetooth
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/dragon/bluetooth
BOARD_HAVE_BLUETOOTH_BCM := true
diff --git a/android_filesystem_config.h b/android_filesystem_config.h
deleted file mode 100644
index 874195f..0000000
--- 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[] = {
- { 00755, AID_ROOT, AID_SHELL, (1ULL << CAP_BLOCK_SUSPEND), "system/bin/glgps" },
-#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 0000000..1893571
--- /dev/null
+++ b/config.fs
@@ -0,0 +1,5 @@
+[system/bin/glgps]
+mode: 0755
+user: AID_ROOT
+group: AID_SHELL
+caps: BLOCK_SUSPEND
