diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-04-04 22:37:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-04-04 22:37:33 +0000 |
| commit | daac3e7f36c9e7d3b1aefd5b13652b708945dd57 (patch) | |
| tree | 172e6ee912b42d250a322e1234d51b917bc2fd7e | |
| parent | cc4ab453d4034e9c586f185e91b098069cceeb06 (diff) | |
| parent | bd9c1ce84295027fbf5719c57e0d37579547f6af (diff) | |
| download | angler-android-wear-7.1.1_r1.tar.gz | |
Merge "TARGET_FS_CONFIG_GEN: switch from android_filesystem_config.h"android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rw-r--r-- | android_filesystem_config.h | 38 | ||||
| -rw-r--r-- | config.fs | 5 |
3 files changed, 7 insertions, 38 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 03a1ec6..f409bc8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -130,4 +130,6 @@ EXTENDED_FONT_FOOTPRINT := true USE_CLANG_PLATFORM_BUILD := true +TARGET_FS_CONFIG_GEN += device/huawei/angler/config.fs + -include vendor/huawei/angler/BoardConfigVendor.mk diff --git a/android_filesystem_config.h b/android_filesystem_config.h deleted file mode 100644 index b21ad10..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[] = { - { 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 0000000..15679d2 --- /dev/null +++ b/config.fs @@ -0,0 +1,5 @@ +[system/bin/qmuxd] +mode: 0700 +user: AID_RADIO +group: AID_SHELL +caps: BLOCK_SUSPEND |