Commits

Show all
Author Commit Message Labels Comments Date
Nick Kralevich
Merge "grouper: label boot block device"
Nick Kralevich
grouper: label boot block device Bug: 19534538 Change-Id: I9aea5c5136e3c366cf90e754d568e7c836cd7796
Shawn Willden
Merge "Separate keymaster0 and keymaster1 HALs."
Shawn Willden
Separate keymaster0 and keymaster1 HALs. Change-Id: Ida47d6fae1ed7e85e7c223900f6b7a2e655fee47
dcashman
Merge "setup_fs: remove permissive_or_unconfined()"
Stephen Smalley
setup_fs: remove permissive_or_unconfined() Change-Id: Ib72a80f1cd4e8d51fc4f1871328e4a0d69638e3e Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Kenny Root
Merge "Remove superfluous OpenSSL include paths."
Adam Langley
Remove superfluous OpenSSL include paths. The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: I53604ba7513e7a5b41e88713a8247f464c1b9a41
Brian Carlstrom
Merge "Remove obsolete dalvik.gc.type-precise"
Brian Carlstrom
Remove obsolete dalvik.gc.type-precise Bug: 18895001 (cherry picked from commit 3dfdf07164f628e1180eba088b73874b04a354bc) Change-Id: Iab47bf3b6fc67f36572f80fd08b96d186e58eed6
Nick Kralevich
Merge "grouper: Add dhcpcd.conf to the project"
Nick Kralevich
Merge "Push wpa_supplicant modules down to the leaf product config."
Dmitry Shmidt
grouper: Add dhcpcd.conf to the project Bug: 17684562 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> (cherry picked from commit 361bda29d63b5f10f45defbbd7c0718247bc1528) Change-Id: Ic256246fc60c5f8a06b2a41b126323db2eaa8bca
Ying Wang
Push wpa_supplicant modules down to the leaf product config. Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in external/wpa_supplicant_8 we don't need those modules if WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk. (cherry picked from commit b6bbd7cf224627a1aba10d3be1f773e5d950ef9a) Change-Id: Iec53d5b447566a511a2b90da7a13a80d45232828
Ying Wang
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang
Cleanup Obsolete LOCAL_PRELINK_MODULE. Bug: 18675947 Change-Id: Ieed848abdd63e5dbc6b7967617f0e3961deafc8d
Dmitriy Ivanov
Merge "Remove check for TARGET_SIMULATOR"
Tags
android-wear-5.0.0_r1
Dmitriy Ivanov
Remove check for TARGET_SIMULATOR Change-Id: Ibde9612146264e975f8bac88c06ec2cd9f5f6867
Elliott Hughes
Merge "Remove grouper BoardConfig.mk no-op."
Elliott Hughes
Remove grouper BoardConfig.mk no-op. Change-Id: Ifd5a3ca4367cb67fa70edf1006a6e75963dc21f0
Nick Kralevich
Merge "Allow recovery to create device nodes and modify rootfs"
Nick Kralevich
Allow recovery to create device nodes and modify rootfs tilapia's OTA code for updating the radio image needs to create files on rootfs and create a character device in /dev. Allow it. (cherrypick from commit de84e45d7e6f9dbd6ba8bfaf592130751d2ea853) Bug: 18281224 Change-Id: Ic408c2b28e16a40650f71efe2f17fb0c2e71f97f
Nick Kralevich
DO NOT MERGE: resync to AOSP mirror-aosp-master and stage-aosp-master should be identical, but they're not. Pull all missing changes from AOSP into stage. Bug: 18224704 Change-Id: Ibe42d00fa1c0b0f81e6c9a3becca338989d6eabc
Bill Yi
Merge commit 'e988432cb944b651f6feb6d9083d1899d67aac4a' into HEAD
Nick Kralevich
am 105946df: (-s ours) Merge "Create touch_fw_update SELinux domain" * commit '105946dfceb0e40edd26b438109f0bacc70285b1': Create touch_fw_update SELinux domain
Nick Kralevich
Merge "Create touch_fw_update SELinux domain"
Nick Kralevich
Create touch_fw_update SELinux domain For the touch_fw_update service, stop using the init_shell domain. The use of init_shell is discouraged, as it tends to get entered into inappropriately, and it contains a random collection of permissions. This is the first step in deleting init_shell (b/18062250). Move the code in init.grouper.rc into a proper shell script, and create an SELinux domain for this shell script. Remove the sysfs bu…
Nick Kralevich
am ecdec417: Merge "Assign specific types to system, recovery, and metadata block device." * commit 'ecdec417a6b37303c178f47aa8dbd0b91505193a': Assign specific types to system, recovery, and metadata block device.
Nick Kralevich
Merge "Assign specific types to system, recovery, and metadata block device."
Stephen Smalley
Assign specific types to system, recovery, and metadata block device. This assigns the types defined by Ie9c1f6d632f6e9e8cbba106f07f6b1979d2a3c4a and Id3bea28f5958086716cd3db055bea309b3b5fa5a to the block device files for the system, recovery, and metadata partitions as per the fstab.<board> file. Change-Id: Ia49d11b4b9eebe848f8688465e86e0bd36419ac5 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
  1. Prev
  2. Next