Commit graph

38250 commits

Author SHA1 Message Date
Jaegeuk Kim
9680cbab65 Merge "fastboot: support f2fs format" am: 21d3840eb3 am: 6c2bfb95ee
am: 1fa1fdb8f9

Change-Id: Iff6751d9b826838496eede0ab6cec8a384e67b48
2017-11-13 23:00:28 +00:00
Jaegeuk Kim
1fa1fdb8f9 Merge "fastboot: support f2fs format" am: 21d3840eb3
am: 6c2bfb95ee

Change-Id: I9204686aa7afd835d6b1f8852b7a082a4b3e13be
2017-11-13 22:55:54 +00:00
Jaegeuk Kim
6c2bfb95ee Merge "fastboot: support f2fs format"
am: 21d3840eb3

Change-Id: I348a523a7822a73a9905a747789571457d2f193e
2017-11-13 22:48:15 +00:00
Jaegeuk Kim
21d3840eb3 Merge "fastboot: support f2fs format" 2017-11-13 22:37:34 +00:00
Calvin On
5b61509339 Merge "Fix logcatd dependency in logpersist." am: d0406316fe am: 8b03fd8441
am: 808c8ca352

Change-Id: Ie2cf5ba632d7a30e98f47b45bc11116660ed80d2
2017-11-13 22:23:53 +00:00
Calvin On
808c8ca352 Merge "Fix logcatd dependency in logpersist." am: d0406316fe
am: 8b03fd8441

Change-Id: I23b13d708cffe44f5016b85dd0820c27097daa44
2017-11-13 22:21:48 +00:00
Calvin On
8b03fd8441 Merge "Fix logcatd dependency in logpersist."
am: d0406316fe

Change-Id: I7bf6bf5afaa453ea553d8e1776f148162b273530
2017-11-13 22:19:44 +00:00
Treehugger Robot
d0406316fe Merge "Fix logcatd dependency in logpersist." 2017-11-13 22:15:24 +00:00
Steven Moreland
2eaa098bfe Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c17 am: 5bd7b32c15
am: 2c531b007e

Change-Id: Iee1ac7081e7954099e9ee77c07480e8db30adb67
2017-11-13 21:19:21 +00:00
Steven Moreland
2c531b007e Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" am: c437e14c17
am: 5bd7b32c15

Change-Id: I0958fea7b320025bb329defe2d26a922e7f236bb
2017-11-13 21:13:50 +00:00
Steven Moreland
5bd7b32c15 Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt"
am: c437e14c17

Change-Id: I7fbdb7ad974663beef8f4a985bbd281228f3230c
2017-11-13 21:11:17 +00:00
Treehugger Robot
c437e14c17 Merge "PRODUCT_TREBLE_LINKER_NAMESPACES for ld.config.txt" 2017-11-13 21:06:34 +00:00
Calvin On
24e7a25836 Fix logcatd dependency in logpersist.
This change ensures that the logcatd binary is properly
included into builds which contain logpersist. logcatd
is required for logpersist to actually work.

Bug: 69171565
Test: make checkbuild
Test: verified that logcatd binary is present in build
Change-Id: I78161998763a4694ba88af43113fef39a5fbd8c8
2017-11-13 12:22:47 -08:00
Elliott Hughes
16a72c83e1 Merge "Remove dead dlmalloc stubs." am: 2736aec411 am: 3f958ed641
am: 28db530ee4

Change-Id: I47c0a749c2e133578d8e00d871f7b6f6aca023af
2017-11-13 17:30:12 +00:00
Elliott Hughes
28db530ee4 Merge "Remove dead dlmalloc stubs." am: 2736aec411
am: 3f958ed641

Change-Id: Icd6df972b4e15bd5badc45442e06298214584586
2017-11-13 17:27:29 +00:00
Elliott Hughes
3f958ed641 Merge "Remove dead dlmalloc stubs."
am: 2736aec411

Change-Id: I65ad892394b8ec7b9e1bc50849b17ebd48efee89
2017-11-13 17:24:55 +00:00
Elliott Hughes
2736aec411 Merge "Remove dead dlmalloc stubs." 2017-11-13 17:22:20 +00:00
Sandeep Patil
71028f9fcd Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" am: 6b07ee9fb5 -s ours am: 6cdd5f9002 -s ours
am: bee3639ab1  -s ours

Change-Id: I0a4d2adc07ab62c6bdffaea2f709e9ff0b62de27
2017-11-13 16:43:48 +00:00
Sandeep Patil
bee3639ab1 Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" am: 6b07ee9fb5 -s ours
am: 6cdd5f9002  -s ours

Change-Id: I3e307c755a38bfea3146f05c97f12eccc6f7658c
2017-11-13 16:41:11 +00:00
Sandeep Patil
6cdd5f9002 Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back"
am: 6b07ee9fb5  -s ours

Change-Id: Ice1295f8e8a6e3aac3bc561fdb2d5d86c56647ea
2017-11-13 16:38:42 +00:00
Treehugger Robot
6b07ee9fb5 Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" 2017-11-13 16:36:34 +00:00
TreeHugger Robot
c6dce2a6a7 Merge "healthd is class hal" 2017-11-12 15:02:21 +00:00
Jaegeuk Kim
d872118d88 fastboot: support f2fs format
+ quota support

This patch fixes broken f2fs_format by replacing the existing flow with calling
legacy mkfs.f2fs binary explicitly likewise ext4.

This removes obsolete ext4 stuffs as well.

Bug: 67009570
Change-Id: Ia81bcbc7adc3a8b57ada860f7f7871602ac1c6e9
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-11-11 18:29:02 -08:00
Bowgo Tsai
00e169ece6 Merge "first stage mount: abort when failed to parse fstab in device-tree" am: d0d7346dc7 am: 9a9469faeb
am: 71096ca58a

Change-Id: I2367c51e77d5edfb30286188f58fcd8e0ebe3195
2017-11-11 01:55:59 +00:00
Bowgo Tsai
71096ca58a Merge "first stage mount: abort when failed to parse fstab in device-tree" am: d0d7346dc7
am: 9a9469faeb

Change-Id: I771fb1be04a12e8166292442a70b9529368c88b5
2017-11-11 01:53:51 +00:00
Bowgo Tsai
9a9469faeb Merge "first stage mount: abort when failed to parse fstab in device-tree"
am: d0d7346dc7

Change-Id: I46322f29c00a54bb6623eeb57c6fc3f076d942f0
2017-11-11 01:51:14 +00:00
Treehugger Robot
d0d7346dc7 Merge "first stage mount: abort when failed to parse fstab in device-tree" 2017-11-11 01:48:30 +00:00
Elliott Hughes
aaaa2555ab Merge "fastboot: show how long extraction takes." am: 0626f7205e am: 178b010713
am: fa10b2bf8d

Change-Id: I54958d081bad6bc8e8207cf1fad0e34740228160
2017-11-11 01:08:55 +00:00
Elliott Hughes
fa10b2bf8d Merge "fastboot: show how long extraction takes." am: 0626f7205e
am: 178b010713

Change-Id: I6e1f6cc010632c030e3618f3cc5e3b989ba0ddba
2017-11-11 01:06:15 +00:00
Elliott Hughes
178b010713 Merge "fastboot: show how long extraction takes."
am: 0626f7205e

Change-Id: I2fb3109f0ea97480e07d8a1245a13ebdc5240285
2017-11-11 01:04:43 +00:00
Elliott Hughes
0626f7205e Merge "fastboot: show how long extraction takes." 2017-11-11 00:59:29 +00:00
Elliott Hughes
e77bdeb74d Merge "Move libcutils source to C++." am: d2ce2f4f45 am: ba3b6a2851
am: 4320727b68

Change-Id: I3544af933a1027410b7b77e847d647dda567dc05
2017-11-11 00:43:22 +00:00
Yifan Hong
aae9ad533c healthd is class hal
because it serves health 2.0 HAL. This forces it to restart when
hwservicemanager dies.

Bug: 69069765
Test: kill hwservicemanager, lshal shows backup instance

Change-Id: Ib51caa0e718031a0f8797d8af4c2459b4958a62e
2017-11-10 16:42:21 -08:00
Elliott Hughes
4320727b68 Merge "Move libcutils source to C++." am: d2ce2f4f45
am: ba3b6a2851

Change-Id: Ifa80cbb1767cd54883e801963631bb7ddd5614c7
2017-11-11 00:41:29 +00:00
Elliott Hughes
ba3b6a2851 Merge "Move libcutils source to C++."
am: d2ce2f4f45

Change-Id: Ieeb013ede9e4ef00a1b90dc42c71cc6412e83415
2017-11-11 00:28:15 +00:00
Elliott Hughes
1412f5ffe3 Remove dead dlmalloc stubs.
Used to be used by ART, but long gone.

Bug: N/A
Test: ran tests
Change-Id: Id231d97b2b797562619e6fd90536b17dbe39f71e
2017-11-10 16:24:18 -08:00
Sandeep Patil
25f1631aa7 DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back
Taimen bootloader passes androidboot.slot for now.
This reverts commit 211a4a5d5a.

Bug: 68710251
Test: taimen successfully mounts partition in first stage
Change-Id: I046afc99120e7ec9ef4b8ea7a852eb70e7231ea9
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-11-10 16:20:27 -08:00
Elliott Hughes
d2ce2f4f45 Merge "Move libcutils source to C++." 2017-11-11 00:18:29 +00:00
Yifan Hong
30e791faa7 Merge "libvndksupport: do not use functions from android/dlext.h" am: 865f9c2f0a am: 9dbbfdc1a5
am: 13e202c56d

Change-Id: Ibd768abc912c943118e044dc425cc2c3d943fcfb
2017-11-10 23:51:49 +00:00
Yifan Hong
13e202c56d Merge "libvndksupport: do not use functions from android/dlext.h" am: 865f9c2f0a
am: 9dbbfdc1a5

Change-Id: Id80f4fe163bf2b79677d2545597ca5f8092851d0
2017-11-10 23:45:52 +00:00
Yifan Hong
9dbbfdc1a5 Merge "libvndksupport: do not use functions from android/dlext.h"
am: 865f9c2f0a

Change-Id: Ibe43d9ac637cf9021e87211b84e9ed5a0f93ab36
2017-11-10 23:40:52 +00:00
Treehugger Robot
865f9c2f0a Merge "libvndksupport: do not use functions from android/dlext.h" 2017-11-10 23:34:08 +00:00
Tianjie Xu
41dee1e2be Merge "Create a new directory on boot for update_engine logs" am: 78d882bb5f am: 5d86509d19
am: 2ca0bbfae3

Change-Id: Ibfb3c4054bb0f06446e5c959335ff2abdbe17370
2017-11-10 22:18:15 +00:00
Tianjie Xu
2ca0bbfae3 Merge "Create a new directory on boot for update_engine logs" am: 78d882bb5f
am: 5d86509d19

Change-Id: I01611463c081fafd60fc315a4a91418a4ddef22a
2017-11-10 22:14:35 +00:00
Tianjie Xu
5d86509d19 Merge "Create a new directory on boot for update_engine logs"
am: 78d882bb5f

Change-Id: I7685ae024fa7fcc49b4fcb6dd8b4f5f753cff239
2017-11-10 22:12:03 +00:00
Tianjie Xu
78d882bb5f Merge "Create a new directory on boot for update_engine logs" 2017-11-10 22:06:53 +00:00
Yifan Hong
1ccdb7d92a libvndksupport: do not use functions from android/dlext.h
... if they are not available. Use weak symbols and do not call the
following functions when they are not defined:

* android_dlopen_ext
* android_get_exported_namespace
Test: links
Test: boots

Change-Id: I653548bac61a0eba001f72bab969b5b858bd1553
2017-11-10 13:19:37 -08:00
Elliott Hughes
8e9aeb9053 Move libcutils source to C++.
Just the minimial changes to get this to actually build, because otherwise
we always bog down trying to rewrite everything (when the real answer
is usually "stop using libcutils, it's awful").

This doesn't move a handful of files: two are basically just BSD libc
source, a couple have outstanding code reviews, and one can be deleted
(but I'll do that in a separate change).

I'm also skipping the presubmit hooks because otherwise clang-format
wants to reformat everything. I'll follow up with that...

Bug: N/A
Test: builds
Change-Id: I06403f465b67c8e493bad466dd76b1151eed5993
2017-11-10 13:18:10 -08:00
TreeHugger Robot
2fcbca57ba Merge "storaged: remove protos from storaged class" 2017-11-10 20:55:38 +00:00
Chenbo Feng
95bc78a481 Merge changes from topic "qtaguidReplace" am: 6707ef139d am: 45eca0a011
am: d5c327e879

Change-Id: I25544be935b5ea9f2413e923e496a39beca45aa3
2017-11-10 18:47:15 +00:00