diff options
| author | Pablo Lunarenko <kimiaropablo958@gmail.com> | 2014-06-14 10:03:54 -0300 |
|---|---|---|
| committer | Pablo Lunarenko <kimiaropablo958@gmail.com> | 2014-06-14 10:03:54 -0300 |
| commit | da65d195d00798d1ff6c011a2630eced9ffbe940 (patch) | |
| tree | 65bc680d3bce405be5227317a6443cb9ce3bd0d9 | |
| parent | 7c9d01c2c78ad76eb597cff3ce645fb663018dac (diff) | |
Remove CMDLINE from u8500-common
CMDLINE is not passed to the kernel here, at all, goodbye.
Also, we don't have bootloader, why not just put the only two valid reboot arguments?
And a reminder, delete the CFLAG DRECOVERY_CANT_USE_CONFIG_EXT4_FS_XATTR when SELinux is implemented anywhere else.
Change-Id: I6bcb4f7f0119213b5971e95eae5f1828c750343d
| -rw-r--r-- | BoardCommonConfig.mk | 3 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/arrays.xml | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index ae43d37..bc2df94 100644 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -54,7 +54,6 @@ TARGET_GLOBAL_CPPFLAGS += -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp BOARD_CUSTOM_BOOTIMG_MK := device/samsung/u8500-common/shbootimg.mk BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_BASE := 0x40000000 -BOARD_KERNEL_CMDLINE := "console=ttySAC2,115200 consoleblank=0 androidboot.selinux=permissive" # Graphics USE_OPENGL_RENDERER := true @@ -116,6 +115,8 @@ BOARD_HAS_NO_SELECT_BUTTON := true BOARD_SUPPRESS_EMMC_WIPE := true RECOVERY_FSTAB_VERSION := 2 BOARD_RECOVERY_SWIPE := true + +# Delete the line below when SELinux is enabled on all devices COMMON_GLOBAL_CFLAGS += -DRECOVERY_CANT_USE_CONFIG_EXT4_FS_XATTR # Releasetools diff --git a/overlay/frameworks/base/core/res/res/values/arrays.xml b/overlay/frameworks/base/core/res/res/values/arrays.xml new file mode 100644 index 0000000..60a57ee --- /dev/null +++ b/overlay/frameworks/base/core/res/res/values/arrays.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Defines the shutdown options shown in the reboot dialog. --> + <array name="shutdown_reboot_options" translatable="false"> + <item>@string/reboot_reboot</item> + <item>@string/reboot_recovery</item> + <item>@string/reboot_download</item> + </array> + + <!-- Do not translate. Defines the shutdown actions passed to the kernel. + The first item should be empty for regular reboot. --> + <string-array name="shutdown_reboot_actions" translatable="false"> + <item></item> + <item>recovery</item> + <item>download</item> + </string-array> + +</resources> |