Commit Graph

26695 Commits

Author SHA1 Message Date
Colin Cross b58d3b2900 Merge "Export android_filesystem_config.h as a filegroup"
am: 80112f73cd

Change-Id: Ia5c3d2ee93f9b5e5838158a49bf4b4cb14e0128c
2017-01-18 16:59:48 +00:00
Colin Cross 80112f73cd Merge "Export android_filesystem_config.h as a filegroup" 2017-01-18 16:53:26 +00:00
Jorim Jaggi 469e51ac4f Merge "Revert "init: split property context into platform & non-platform components""
am: 8e81cd6609

Change-Id: Ia1db23aca8da20fef7288fcd4c4c1c583ad63d09
2017-01-18 16:44:31 +00:00
Jorim Jaggi 3b6c6d5d90 Revert "init: split property context into platform & non-platform components"
am: 328cb5d141

Change-Id: I27df33e9ddcf2d6523118a6286b8a98160d723b3
2017-01-18 16:41:57 +00:00
Jorim Jaggi 8e81cd6609 Merge "Revert "init: split property context into platform & non-platform components"" 2017-01-18 16:33:32 +00:00
Jorim Jaggi 328cb5d141 Revert "init: split property context into platform & non-platform components"
This reverts commit 871c306855.

Change-Id: I3e14b71e9fc5f37c9691405ce20031451643f9b4
2017-01-18 15:33:26 +00:00
Sandeep Patil b29cafdd83 Merge "init: split property context into platform & non-platform components"
am: b8e5553887

Change-Id: Id1b5514a10fadbc3ee61c5c36e2f054d9f5930a3
2017-01-18 06:17:55 +00:00
Sandeep Patil ca1bcdb286 init: split property context into platform & non-platform components
am: 871c306855

Change-Id: I2702dba233f674a19e7a44541e74124be3b0b0f0
2017-01-18 06:17:53 +00:00
Treehugger Robot b8e5553887 Merge "init: split property context into platform & non-platform components" 2017-01-18 06:09:02 +00:00
Colin Cross 1207ba3d5a Export android_filesystem_config.h as a filegroup
bionic/libc/Android.bp needs to reference android_filesystem_config.h,
export it using a filegroup module.

Bug: 34283327
Test: builds
Change-Id: Id7650f3b64d7eb52f945f538d05b691b8b3c3fcb
2017-01-17 18:20:28 -08:00
Winter Wang 6a5f085288 Merge "init: usb: fix audio_source function typo"
am: 56098eed3b

Change-Id: I3d27da1b19ec01de99ea7092b816f0a67789db19
2017-01-18 01:44:21 +00:00
Treehugger Robot 56098eed3b Merge "init: usb: fix audio_source function typo" 2017-01-18 01:39:39 +00:00
James Hawkins c5129582bb Merge "bootstat: Fix false metrics due to soft reboots."
am: bde89da5fc

Change-Id: I4c49fff20f78e4bff744dfe94a7207cf7e151404
2017-01-17 23:50:15 +00:00
James Hawkins bde89da5fc Merge "bootstat: Fix false metrics due to soft reboots." 2017-01-17 23:46:58 +00:00
Winter Wang 60c763ed52 init: usb: fix audio_source function typo
for audio_source function instance, there exist 2 function name here:
    "audio_source.gs2" and "audio_source.gs3"
I believe this usb accessory audio name "audio_source.gs2" is a typo,
as there is no need to create another audio_source instance.

Test: Manual

Change-Id: I70b513db474632eb990131c285c8d5105c17970f
Signed-off-by: Winter Wang <wente.wang@nxp.com>
2017-01-17 14:27:34 -08:00
James Hawkins 800ceb45b1 bootstat: Fix false metrics due to soft reboots.
Use a flag to enable/disable logging metrics, set to false during soft
reboots.

Bug: 32807863
Change-Id: Ib1359327af4e18d40400c29961c454f7be1b8d0c
Test: None
2017-01-17 13:28:17 -08:00
Tao Bao bd8a24e292 Merge "Revert "init: add ro.boot.init_rc""
am: 4c5c9db17b

Change-Id: I837b786637e5862cbad3338d053ce9b8c730241b
2017-01-17 20:25:29 +00:00
Tao Bao 4c5c9db17b Merge "Revert "init: add ro.boot.init_rc"" 2017-01-17 20:19:23 +00:00
Tao Bao 01519a207c Revert "init: add ro.boot.init_rc"
This reverts commit 7e6d30e5f2.

Bug: 26639863
Bug: 34318089
Change-Id: Ie71d773ee7c6c6a90e8298f8e0798eacba12d0be
2017-01-17 20:16:45 +00:00
Elliott Hughes ed67c75206 Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry."
am: c160675a93

Change-Id: Ic8e6d589d3a6bbc630202356d85851ed5729e22c
2017-01-16 18:18:03 +00:00
Treehugger Robot c160675a93 Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry." 2017-01-16 18:10:46 +00:00
Elliott Hughes ebeaa67c0c Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry.
Bug: N/A
Test: builds
Change-Id: Icaf095f0c25fae5c1175dbb630bc05c63af72d75
2017-01-15 11:52:35 -08:00
Elliott Hughes e7c8bb473e Merge "bootable/recovery wants EqualsIgnoreCase."
am: 89e99f9e0e

Change-Id: Id7480e1a1fec5626a0bec22c2128dd419533e1aa
2017-01-14 18:26:21 +00:00
Elliott Hughes 89e99f9e0e Merge "bootable/recovery wants EqualsIgnoreCase." 2017-01-14 18:22:32 +00:00
Hung-ying Tyan 1d1b981f95 Merge "init: add ro.boot.init_rc"
am: 0cf5e36c00

Change-Id: I14b7e7d7bb7d98fac9126a0a1e624bb180529028
2017-01-14 08:11:37 +00:00
Treehugger Robot 0cf5e36c00 Merge "init: add ro.boot.init_rc" 2017-01-14 08:06:09 +00:00
Elliott Hughes 2140782d24 bootable/recovery wants EqualsIgnoreCase.
Bug: N/A
Test: ran tests
Change-Id: I4a6ee9eba0514b8bb8fb0489f4d370964ce9c1c2
2017-01-13 18:51:32 -08:00
Elliott Hughes 5bdade8a93 Merge "-e is really about TCP/IP devices, not emulators."
am: f28f7c8a74

Change-Id: I9c15948b84956030eec73358cc6454ed8a16d9bc
2017-01-14 02:51:22 +00:00
Treehugger Robot f28f7c8a74 Merge "-e is really about TCP/IP devices, not emulators." 2017-01-14 02:47:21 +00:00
Elliott Hughes b095bf0cf9 Merge "Switch fastboot docs to markdown."
am: e94deb3a51

Change-Id: Ib9e354ecde88cfe914e95b5ab1e2ab41aad8022d
2017-01-14 02:26:51 +00:00
Elliott Hughes e94deb3a51 Merge "Switch fastboot docs to markdown." 2017-01-14 02:23:44 +00:00
Elliott Hughes 83ab5c29c1 -e is really about TCP/IP devices, not emulators.
Despite the name.

Bug: N/A
Test: N/A
Change-Id: I099222137fabf68f961a6a2e5d11f2904ffd5a0d
2017-01-13 16:58:25 -08:00
Elliott Hughes 84cb36e02d Switch fastboot docs to markdown.
Bug: N/A
Test: N/A
Change-Id: I4713c692f67e1aaba079819a6876d0c7bb94f925
2017-01-13 16:03:13 -08:00
Elliott Hughes e8250c0702 Merge "Fix libbase file.Readlink test on marlin/sailfish."
am: 3052d123a8

Change-Id: I54cf0e2f4adc1786bff40e3fa5b5f97e9c7514d6
2017-01-13 21:18:30 +00:00
Elliott Hughes 3052d123a8 Merge "Fix libbase file.Readlink test on marlin/sailfish." 2017-01-13 21:12:21 +00:00
Elliott Hughes 84f52c10a5 Merge "Move to .md files for even trivial documentation."
am: 5d05d0e74e

Change-Id: If8300cc2d2928520bfe19b36c4fea83cd9558b7a
2017-01-13 19:41:53 +00:00
Treehugger Robot 5d05d0e74e Merge "Move to .md files for even trivial documentation." 2017-01-13 19:39:26 +00:00
bowgotsai 538cef7b48 Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp"
am: 8c301d22e4

Change-Id: I74645eef0fbb6ad5ebbc565f2e7b848bbd200959
2017-01-13 18:01:58 +00:00
Jorge Lucangeli Obes 4503269951 Merge "Check the return value of setuid(2)."
am: 155d2bcb7a

Change-Id: I6d2a0d65d21d525c411d142cfdd29b660ec2fab0
2017-01-13 18:01:45 +00:00
Treehugger Robot 8c301d22e4 Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" 2017-01-13 17:57:45 +00:00
Treehugger Robot 155d2bcb7a Merge "Check the return value of setuid(2)." 2017-01-13 17:48:08 +00:00
Jorge Lucangeli Obes f4ae42f6a8 Check the return value of setuid(2).
I'd like to mark setuid() WARN_UNUSED_RESULT to prevent security bugs.
This line would break because the file is compiled with -Werror.

Bug: 34251640
Test: Build, run unit test.
Change-Id: Ibb6fa5e5b899d47f77f2a32da762165de310101d
2017-01-13 15:43:45 +00:00
Mark Salyzyn 8548d54b2f Merge "trusty: use log/log.h for ALOG macros"
am: dc40813167

Change-Id: Id92489dd0b84255c1ec0033137cefd14181ca1c6
2017-01-13 15:40:05 +00:00
Mark Salyzyn dc40813167 Merge "trusty: use log/log.h for ALOG macros" 2017-01-13 15:32:39 +00:00
Mark Salyzyn 5654a887b1 trusty: use log/log.h for ALOG macros
Test: compile
Bug: 34250038
Change-Id: I12e7c6ea5a9ca950751fcf65352889650f198986
2017-01-13 07:30:11 -08:00
bowgotsai 47aa2a7520 fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp
Make the code more C++-ish by replacing char* or char** with
std::string&.

Bug: 31264231
Test: check device can boot with dm-verity
Change-Id: Ie3ca3f449b52959d1a7b2887d722eb5ce366c4f9
2017-01-13 17:39:04 +08:00
Wei Wang 974dd6291e Merge "libcutils: change klog_level to KLOG_INFO_LEVEL"
am: 5e9863bf63

Change-Id: I3c3a4e21d803e615c9fab7cdb381b9e3c2586667
2017-01-13 08:13:37 +00:00
Treehugger Robot 5e9863bf63 Merge "libcutils: change klog_level to KLOG_INFO_LEVEL" 2017-01-13 08:08:26 +00:00
Elliott Hughes 15f0f504ac Move to .md files for even trivial documentation.
So it's automatically displayed for folks browsing the source.

Bug: N/A
Test: N/A
Change-Id: Ib595ab428054f274a92374728e3e66474ffc5116
2017-01-12 22:40:49 -08:00
bowgotsai ca11618b25 Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp"
am: a37ff0dd83

Change-Id: Id611e9d1d887f6f568c5116069344da5111aa113
2017-01-13 06:26:01 +00:00