diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2017-08-31 15:22:39 -0700 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2017-09-06 10:16:43 -0700 |
| commit | d233bece3839fe8a0490d6113a7b84cd5940c490 (patch) | |
| tree | 4b6e15b0c8a8bf68a4b84fe43a28b0a7f3abec93 /sailfish | |
| parent | 1818b8c453f4b1cf9a77075f0bd06f9709cd0cda (diff) | |
Remove /bt_firmware and bt_firmware from android_device_dirs
BT firmware has been moved to /vendor/firmware
Bug: 64905218
Test: Built successfully; BT works fine.
Change-Id: Ib39086676ef62e12d73b44bcbc8dda5dca9158a5
Diffstat (limited to 'sailfish')
| -rw-r--r-- | sailfish/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | sailfish/android_filesystem_config.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk index cb8aff2a..199d0302 100644 --- a/sailfish/BoardConfig.mk +++ b/sailfish/BoardConfig.mk @@ -90,7 +90,7 @@ endif BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=sailfish user_debug=31 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=32M@0-0xffffffff loop.max_part=7 -BOARD_ROOT_EXTRA_FOLDERS := bt_firmware firmware firmware/radio persist +BOARD_ROOT_EXTRA_FOLDERS := firmware firmware/radio persist BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy diff --git a/sailfish/android_filesystem_config.h b/sailfish/android_filesystem_config.h index bc92bd47..dfec7d64 100644 --- a/sailfish/android_filesystem_config.h +++ b/sailfish/android_filesystem_config.h @@ -21,9 +21,8 @@ #include <private/android_filesystem_config.h> -static const struct fs_path_config android_device_dirs[] = { - { 00771, AID_SYSTEM, AID_SYSTEM, 0, "bt_firmware"}, -}; +#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 |