Commit graph

29259 commits

Author SHA1 Message Date
Christopher Ferris
d58265e72a Merge "Implement maps parsing."
am: 33e6b18d35

Change-Id: I1673e501a90c559bc491c929e21bca6f6cec3a22
2017-04-07 16:53:40 +00:00
Christopher Ferris
33e6b18d35 Merge "Implement maps parsing." 2017-04-07 16:45:36 +00:00
Dan Cashman
6f18343656 Merge "Reflect move of mapping file to /system."
am: a74635d33e

Change-Id: Idf88cf223deb529faef0f805e5dc301e5ff92172
2017-04-07 14:30:47 +00:00
Treehugger Robot
a74635d33e Merge "Reflect move of mapping file to /system." 2017-04-07 14:25:33 +00:00
Tom Cherry
6510908bd1 Merge "init: more header cleanup"
am: ab5ab1ebd4

Change-Id: I1f7cdd93e96e47cadf9b80ba428d11a358a49176
2017-04-07 02:52:01 +00:00
Treehugger Robot
ab5ab1ebd4 Merge "init: more header cleanup" 2017-04-07 02:44:07 +00:00
Thierry Strudel
bb1c8f3691 Merge "Revert "libcutils: fs_config: target_out_path assumed /system""
am: ad90763ab9

Change-Id: I132fc583194a7225b3572b226344e884a432caf6
2017-04-07 02:08:29 +00:00
Treehugger Robot
ad90763ab9 Merge "Revert "libcutils: fs_config: target_out_path assumed /system"" 2017-04-07 02:03:23 +00:00
Tom Cherry
3f5eaae526 init: more header cleanup
Remove includes of "log.h" that really want <android-base/logging.h>
Fix header include order
Remove headers included in .cpp files that their associated .h already includes
Remove some unused headers

Test: boot bullhead
Change-Id: I2b415adfe86a5c8bbe4fb1ebc53c7b0ee2253824
2017-04-06 18:06:34 -07:00
Adam Lesinski
b087e37d4c Merge "ZipWriter: Do not write DataDescriptor for STORED files"
am: 47f5581927

Change-Id: I1c2fa98c84b699063b75fb04d41d6b36e00f6891
2017-04-07 00:41:21 +00:00
Thierry Strudel
29e0c8f1a9 Revert "libcutils: fs_config: target_out_path assumed /system"
This reverts commit 7130fb345d.

Bug: 36816191
Change-Id: I7d604d510865b1fa15781ffb4ad8b3e77ac44395
2017-04-07 00:34:03 +00:00
Adam Lesinski
47f5581927 Merge "ZipWriter: Do not write DataDescriptor for STORED files" 2017-04-07 00:33:20 +00:00
Tom Cherry
e6b70f5913 Merge "ueventd: Write tests for the get_*_symlinks() functions"
am: e7fbd6a2b4

Change-Id: Ia77a42ebcce14036c71b2885d39372a9a4456649
2017-04-07 00:23:22 +00:00
Tom Cherry
e7fbd6a2b4 Merge "ueventd: Write tests for the get_*_symlinks() functions" 2017-04-07 00:14:03 +00:00
Adam Lesinski
e2fa70bcb0 ZipWriter: Do not write DataDescriptor for STORED files
Older implementations of ZIP (Java's ZipInputStream) don't
like a Data Descriptor trailing after an uncompressed entry.

If the FILE is seekable, and the entry is uncompressed, seek
back to the header and write out the crc and sizes.

(cherry-pick of commit 639814d946)

Bug: 36686974
Test: make ziparchive_tests
Change-Id: I61664515e5afa3e2ba814874eeac847a2aaac319
2017-04-06 17:03:32 -07:00
Tom Cherry
e24876879a Merge "Add android::base::ScopeGuard"
am: 5c3961c547

Change-Id: I81bff856294196ab3eb02ac83ee569f90e8eea77
2017-04-06 22:45:29 +00:00
Tom Cherry
5c3961c547 Merge "Add android::base::ScopeGuard" 2017-04-06 22:41:02 +00:00
Liu Changcheng
381a13555d Merge "check send_signal result before further dealing"
am: 5830f7b564

Change-Id: Ifa03a6caa7710ea4578f628b467adb655f954620
2017-04-06 22:31:48 +00:00
Treehugger Robot
5830f7b564 Merge "check send_signal result before further dealing" 2017-04-06 22:23:28 +00:00
Christopher Ferris
09385e7db5 Implement maps parsing.
The MapsOffline code is still in development so I'm not testing it very
thoroughly yet.

Bug: 23762183

Test: All unit tests pass.
Change-Id: I77aeac62940cd95c489ee221afe02349bfe39671
2017-04-06 15:01:02 -07:00
Dan Cashman
299231152e Reflect move of mapping file to /system.
Bug: 36783775
Test: boot device with matching sha256 and non-matching and verify that
device boots and uses either precompiled or compiled policy as needed. Also
verify that mapping_sepolicy.cil has moved.

(cherry-pick of commit: 39ffec779a)
Change-Id: I9c3df2e7ed3f0eadd98e98529ebed360fec66dba
2017-04-06 12:52:33 -07:00
Mark Salyzyn
d7acf56639 Merge "logd: test: logd.sepolicy* errors"
am: ebc87c98e3

Change-Id: I8b35923c397d8293c1054e103296add4508db472
2017-04-06 17:42:39 +00:00
Treehugger Robot
ebc87c98e3 Merge "logd: test: logd.sepolicy* errors" 2017-04-06 17:33:48 +00:00
Liu Changcheng
3492221fcf check send_signal result before further dealing
If send_signal failed, debuggerd_trigger_dump should return
instead of further dealing

Change-Id: I0a1ac4255344d1da7a21917ad559b9de4d5a4fee
Signed-off-by: Liu Changcheng <changcheng.liu@intel.com>
Signed-off-by: Jerry Liu <primerlink@gmail.com>
2017-04-06 22:47:00 +08:00
Mark Salyzyn
bc1d2aeff9 logd: test: logd.sepolicy* errors
If setcon fails, try alternate setcon, and then if it still
fails call getcon to confirm if it is an OK sepolicy context
anyways.

Test: gTest logd-unit-tests --gtest_filter=logd.sepolicy*
Change-Id: Iaf20b8a1a4a7312247288e1879884a54893c15ae
2017-04-06 07:40:10 -07:00
Dan Shi
5358155528 Merge "Add test config to bootstat_tests"
am: 3d5cd59d73

Change-Id: Ie095ec5e2301fb0fc2db1350b43056b06fd6b617
2017-04-06 03:10:24 +00:00
Treehugger Robot
3d5cd59d73 Merge "Add test config to bootstat_tests" 2017-04-06 03:01:29 +00:00
Tom Cherry
c44f6a4073 ueventd: Write tests for the get_*_symlinks() functions
Bug: 33785894
Bug: 36250207
Test: Boot bullhead + new unit tests
Change-Id: Ia0f290542eb1cffce5ae876dfedb453dde960253
2017-04-05 18:21:39 -07:00
Mark Salyzyn
27c796b2f7 Merge "libcutils: fs_config: target_out_path assumed /system"
am: 66b8491719

Change-Id: I399f82026a4b4a77338dbdbbd2c923a9692f9b07
2017-04-06 00:14:29 +00:00
Treehugger Robot
66b8491719 Merge "libcutils: fs_config: target_out_path assumed /system" 2017-04-06 00:03:14 +00:00
Tom Cherry
c996a8e73e Add android::base::ScopeGuard
Taken from bionic/libc/private/ScopeGuard.h.

Test: New unit tests
Change-Id: If83c1990efbf294aee0b5d40a7a9ac326e5e765e
2017-04-05 16:15:33 -07:00
Christopher Ferris
906709aa75 Merge "Convert opens to use unique_fd."
am: ff93b794b5

Change-Id: I53278a094a4d96f9bcb32faa311e560728f76e10
2017-04-05 22:50:03 +00:00
Mark Salyzyn
4f2753fd91 Merge "liblog: worry over resource leaks"
am: acc0e98b0f

Change-Id: Ibc6883cd11daa49501f91166830e8e27f66f21ef
2017-04-05 22:49:50 +00:00
Christopher Ferris
ff93b794b5 Merge "Convert opens to use unique_fd." 2017-04-05 22:47:25 +00:00
Mark Salyzyn
7130fb345d libcutils: fs_config: target_out_path assumed /system
Strip off /system/ and add appropriate config directory.

Test: manual build successfully interprets all etc/fs_config_* files.
Bug: 36071012
Change-Id: I2563248e91cea10fef3cc2f9e954e4782fdfce4f
2017-04-05 22:32:22 +00:00
Mark Salyzyn
acc0e98b0f Merge "liblog: worry over resource leaks" 2017-04-05 22:28:38 +00:00
Mark Salyzyn
191afba9bd liblog: worry over resource leaks
Add comments so that future selves can clearly see there are no file
descriptor resource leaks on normal return.

SideEffects: None
Test: Build
Change-Id: Ieec504fea00fb849cdb69c669655a918d1334e61
2017-04-05 13:02:08 -07:00
Christopher Ferris
48d08c2c9d Convert opens to use unique_fd.
Fixes a potential leak of fds in WriteStringToFile.

Test: I wrote a temporary test that failed the fchmod on host in
Test: WriteStringToFile. I verified this fails with the old code after running
Test: out of fds and passes with the new code.
Change-Id: I168160841e35dd480d59a69bb4aa8176899fbb32
2017-04-05 12:30:12 -07:00
Christopher Ferris
dbd463fc0b Merge "Add Symbols parsing."
am: 568dc01fdf

Change-Id: I8bf2d09b6bd9b32f8e688d6bbb17b7552acca0de
2017-04-05 17:30:15 +00:00
Rubin Xu
3651e52903 Merge "Fix liblog#__security failure"
am: 7887dd8567

Change-Id: I40443a10f9e59bc8099e4204ffe3ca808c5a1c0b
2017-04-05 17:27:16 +00:00
Christopher Ferris
568dc01fdf Merge "Add Symbols parsing." 2017-04-05 17:26:32 +00:00
Rubin Xu
7887dd8567 Merge "Fix liblog#__security failure" 2017-04-05 17:22:43 +00:00
Dan Shi
0f0cccc102 Add test config to bootstat_tests
This change allows TradeFederation to run the test directly.
Refer to b/35882476 for design and discussion of this change.

Bug: 35882476
Test: local test
tradefed.sh run template/local --template:map test=bootstat_tests

Change-Id: I3bc2fa19faebe21f6faf8b81e206ea1581918344
2017-04-05 14:49:47 +00:00
Rubin Xu
235cf8d729 Fix liblog#__security failure
Update pid and gid value after calling setuid()

Bug: 36480230
Test: cts-tradefed run cts -m CtsLiblogTestCases -t liblog#__security_buffer
Change-Id: I707f7c724d64236ec17f2d978c85883a7b4f180f
Merges-In: I707f7c724d64236ec17f2d978c85883a7b4f180f
2017-04-05 11:27:48 +01:00
Dan Shi
0b842b37f6 Merge "Add test config to libcutils_test"
am: c1c0de3945

Change-Id: I6db1561c2153df96a7c4faa166963b0d1855e285
2017-04-05 06:42:33 +00:00
Treehugger Robot
c1c0de3945 Merge "Add test config to libcutils_test" 2017-04-05 06:39:42 +00:00
Josh Gao
e6ccb6c03e Merge changes Ib8369088,I743433bc
am: 8b951f5adc

Change-Id: I85db0865fab80bcf8c6e2cacf890c61c2dd2c458
2017-04-05 04:24:57 +00:00
Josh Gao
8b951f5adc Merge changes Ib8369088,I743433bc
* changes:
  debuggerd_test: remove useless pipe.
  debuggerd_client: fix infinite timeouts.
2017-04-05 04:20:14 +00:00
Steven Moreland
795eb840a7 Merge "init.rc: add class_start early_hal"
am: 7bbd2a5290

Change-Id: I4a87771a45921b9fc7124c9a0d25ebc8bb0c9088
2017-04-05 00:40:35 +00:00
Treehugger Robot
7bbd2a5290 Merge "init.rc: add class_start early_hal" 2017-04-05 00:35:00 +00:00