Inseob Kim
dbe48bc748
Merge "Add /system/product/* paths to permitted paths" am: c733e5af3c am: af818a799d
...
am: ddc022c371
2018-06-18 00:40:07 -07:00
Inseob Kim
ddc022c371
Merge "Add /system/product/* paths to permitted paths" am: c733e5af3c
...
am: af818a799d
2018-06-18 00:35:57 -07:00
Inseob Kim
af818a799d
Merge "Add /system/product/* paths to permitted paths"
...
am: c733e5af3c
2018-06-18 00:31:48 -07:00
Treehugger Robot
c733e5af3c
Merge "Add /system/product/* paths to permitted paths"
2018-06-18 07:18:59 +00:00
Inseob Kim
3918936b9e
Add /system/product/* paths to permitted paths
...
As linker doesn't resolve paths in permitted paths, /system/product
variants should be added to support devices having product partition
under /system.
Bug: 110286945
Test: m -j succeeds on taimen and libraries under /system can dlopen
libraries under /system/product/apps
Change-Id: Icd102d44511702e4ec66c07a367b59c3d9700a44
2018-06-18 14:16:49 +09:00
Elliott Hughes
076c6c8ca1
resolve merge conflicts of 8c6f7ec060 to stage-aosp-master am: d60dad16a3
...
am: e54be2dc3e
2018-06-16 10:20:10 -07:00
Elliott Hughes
e54be2dc3e
resolve merge conflicts of 8c6f7ec060 to stage-aosp-master
...
am: d60dad16a3
2018-06-16 10:16:04 -07:00
Elliott Hughes
d60dad16a3
resolve merge conflicts of 8c6f7ec060 to stage-aosp-master
...
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibd2adc272b69d9752f04bee5901fc7590aaaf93a
2018-06-16 08:37:57 -07:00
Elliott Hughes
8c6f7ec060
Merge "bootstat: remove the only caller of liblogcat."
2018-06-15 21:44:23 +00:00
Elliott Hughes
9d809ff34b
bootstat: remove the only caller of liblogcat.
...
am: bb98f295dd
2018-06-15 12:43:15 -07:00
Elliott Hughes
50a24eb3bc
bootstat: remove the only caller of liblogcat.
...
We need to make progress both on adding the real interface for battery
level and cleaning up logging. This stands in the way of both.
Bug: http://b/77725702
Test: builds
Change-Id: Ia457e497606c2c7965d6895baebb26eef17857c9
Merged-In: Ia457e497606c2c7965d6895baebb26eef17857c9
2018-06-15 12:36:46 -07:00
Elliott Hughes
bb98f295dd
bootstat: remove the only caller of liblogcat.
...
We need to make progress both on adding the real interface for battery
level and cleaning up logging. This stands in the way of both.
Bug: http://b/77725702
Test: builds
Change-Id: Ia457e497606c2c7965d6895baebb26eef17857c9
(cherry picked from commit dbb650dd81
2018-06-15 17:35:06 +00:00
Elliott Hughes
005c8d1441
Merge "bootstat: remove the only caller of liblogcat."
2018-06-15 17:34:53 +00:00
Tom Cherry
2e757e75cd
Merge "Relax host init parser to work with the build system" am: 4632f4e868 am: 831e67192c
...
am: bfcb428318
2018-06-15 10:16:39 -07:00
Tom Cherry
bfcb428318
Merge "Relax host init parser to work with the build system" am: 4632f4e868
...
am: 831e67192c
2018-06-15 10:11:18 -07:00
Tom Cherry
831e67192c
Merge "Relax host init parser to work with the build system"
...
am: 4632f4e868
2018-06-15 10:07:13 -07:00
Tom Cherry
4632f4e868
Merge "Relax host init parser to work with the build system"
2018-06-15 17:03:42 +00:00
Elliott Hughes
4e490789fb
Merge "libsync: add __INTRODUCED_IN annotations." am: 9d9c91acdc am: 832a5b0736
...
am: f46e09a9fe
2018-06-15 09:27:01 -07:00
Elliott Hughes
dbb650dd81
bootstat: remove the only caller of liblogcat.
...
We need to make progress both on adding the real interface for battery
level and cleaning up logging. This stands in the way of both.
Bug: http://b/77725702
Test: builds
Change-Id: Ia457e497606c2c7965d6895baebb26eef17857c9
2018-06-15 09:25:23 -07:00
Elliott Hughes
f46e09a9fe
Merge "libsync: add __INTRODUCED_IN annotations." am: 9d9c91acdc
...
am: 832a5b0736
2018-06-15 09:23:08 -07:00
Elliott Hughes
832a5b0736
Merge "libsync: add __INTRODUCED_IN annotations."
...
am: 9d9c91acdc
2018-06-15 09:18:17 -07:00
Elliott Hughes
9d9c91acdc
Merge "libsync: add __INTRODUCED_IN annotations."
2018-06-15 16:08:51 +00:00
Josh Gao
b98a66d0f3
Merge "debuggerd: add support for Java traces." am: 60e9dad71e am: 62717cf94a
...
am: 93916bf636
2018-06-14 18:02:21 -07:00
Josh Gao
93916bf636
Merge "debuggerd: add support for Java traces." am: 60e9dad71e
...
am: 62717cf94a
2018-06-14 17:56:11 -07:00
Josh Gao
62717cf94a
Merge "debuggerd: add support for Java traces."
...
am: 60e9dad71e
2018-06-14 17:52:32 -07:00
Treehugger Robot
60e9dad71e
Merge "debuggerd: add support for Java traces."
2018-06-15 00:40:41 +00:00
Mark Salyzyn
1a8888b3f0
resolve merge conflicts of ca57890a80 to stage-aosp-master am: a58318960e
...
am: 23854244cd
2018-06-14 17:36:02 -07:00
Mark Salyzyn
23854244cd
resolve merge conflicts of ca57890a80 to stage-aosp-master
...
am: a58318960e
2018-06-14 17:21:22 -07:00
Josh Gao
24113ae641
debuggerd: add support for Java traces.
...
Test: `debuggerd -j $(pidof com.android.settings)`
Change-Id: I051c9b6d313e5350416b3d0743c3fc75f43fbd0c
2018-06-14 15:40:06 -07:00
Elliott Hughes
2a358106b7
libsync: add __INTRODUCED_IN annotations.
...
Bug: https://github.com/android-ndk/ndk/issues/706
Test: N/A
Change-Id: I8a4f98f2c929e28d81672d7e2e0d5dd63d27c7a6
2018-06-14 15:27:26 -07:00
Mark Salyzyn
a58318960e
resolve merge conflicts of ca57890a80 to stage-aosp-master
...
Bug: 86671991
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia49d1a9311f6a7a84dd96c31f79ecdc3143084b2
2018-06-14 15:06:36 -07:00
Wei Wang
76959a5369
Merge "Revert "init: Add warning in init first stage mount"" am: 62dbf90225 am: fb0500e0aa
...
am: ba0897641b
2018-06-14 14:25:32 -07:00
Wei Wang
ba0897641b
Merge "Revert "init: Add warning in init first stage mount"" am: 62dbf90225
...
am: fb0500e0aa
2018-06-14 14:12:32 -07:00
Tom Cherry
863d808c2e
Relax host init parser to work with the build system
...
It's not going to be possible to safely assume $OUT has the right init
scripts to be parsed at a given point, so instead we fall back to
parsing init scripts individually.
This isn't a full revert of the previous commits. We retain parsing
correctness of the 'import' statements and we retain using the new
host side property functionality.
Also, fix a bug where main was not actually returning -1 on failure
Bug: 36970783
Test: testing individual files still works correctly
Change-Id: I4ae5620f234caa08993deb2c30825904a75f6654
2018-06-14 14:08:33 -07:00
Treehugger Robot
ca57890a80
Merge "bootstat: clear persist.sys.boot.reason once read"
2018-06-14 20:58:25 +00:00
Wei Wang
fb0500e0aa
Merge "Revert "init: Add warning in init first stage mount""
...
am: 62dbf90225
2018-06-14 13:56:18 -07:00
Elliott Hughes
0f684b45e6
Merge "mkbootimg: add hridya@ to OWNERS." am: fd342497a3 am: 9985b6eb4f
...
am: 406d6c2639
2018-06-14 13:50:04 -07:00
Elliott Hughes
8df6f3928b
Merge "Fix adb logcat return code." am: 5587aba58d am: e6df12e68c
...
am: 3d8dfe32e1
2018-06-14 13:47:57 -07:00
Treehugger Robot
62dbf90225
Merge "Revert "init: Add warning in init first stage mount""
2018-06-14 20:40:17 +00:00
Elliott Hughes
406d6c2639
Merge "mkbootimg: add hridya@ to OWNERS." am: fd342497a3
...
am: 9985b6eb4f
2018-06-14 13:21:04 -07:00
Elliott Hughes
3d8dfe32e1
Merge "Fix adb logcat return code." am: 5587aba58d
...
am: e6df12e68c
2018-06-14 13:20:23 -07:00
Elliott Hughes
9985b6eb4f
Merge "mkbootimg: add hridya@ to OWNERS."
...
am: fd342497a3
2018-06-14 13:07:35 -07:00
Elliott Hughes
e6df12e68c
Merge "Fix adb logcat return code."
...
am: 5587aba58d
2018-06-14 13:07:00 -07:00
Treehugger Robot
fd342497a3
Merge "mkbootimg: add hridya@ to OWNERS."
2018-06-14 19:43:28 +00:00
Elliott Hughes
5587aba58d
Merge "Fix adb logcat return code."
2018-06-14 19:38:08 +00:00
Wei Wang
37acac49e2
Revert "init: Add warning in init first stage mount"
...
This reverts commit fdafb3d0ec
2018-06-14 18:51:43 +00:00
Elliott Hughes
31f0f1bcee
Fix adb logcat return code.
...
`adb shell logcat` works, and `adb logcat` should too.
Bug: http://b/110202648
Test: suspended the logd process and manually removed the socket
Change-Id: If14de7c2eb178c7b4210d6bdb44df084615db33a
2018-06-14 10:47:00 -07:00
Hridya Valsaraju
1bdf471d4e
[automerger skipped] Merge "Populate recovery DTBO offset correctly" into pi-dev am: 74e8061fd0 -s ours
...
am: d62424feb2
2018-06-14 10:43:34 -07:00
Hridya Valsaraju
cc38551204
[automerger skipped] Correct comment in boot image header am: f514f6f66a -s ours
...
am: 76d79343c4
2018-06-14 10:42:37 -07:00
Android Build Merger (Role)
f73cc9d9d2
[automerger] Merge "Populate recovery DTBO offset correctly" into pi-dev am: 74e8061fd0 am: 29bb250c05
...
Change-Id: If36bb54d87e4acb6bbd93af8127ab903fff1e1c5
2018-06-14 17:40:55 +00:00
