openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
35,143 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

35143 Commits

Author SHA1 Message Date
Treehugger Robot a6bee4a29e Merge "Add test config for memunreachable_test" 2017-07-07 04:11:22 +00:00
Colin Cross 3c49275dfb Merge "Remove reference to deleted gzip module" am: 48d610ab18 am: 55665c3c97 
am: 2a0f067126

Change-Id: I37fe0fab5d3afc163296116a3f5df4b6e8c59e58
 2017-07-07 01:48:49 +00:00
Colin Cross 2a0f067126 Merge "Remove reference to deleted gzip module" am: 48d610ab18 
am: 55665c3c97

Change-Id: I888db7ef5fdcf5b80d7317ff806c24506d31c72e
 2017-07-07 01:45:46 +00:00
Colin Cross 55665c3c97 Merge "Remove reference to deleted gzip module" 
am: 48d610ab18

Change-Id: I5be86c2fb388df0e651c089040adc9be2580f4d6
 2017-07-07 01:44:05 +00:00
Treehugger Robot 48d610ab18 Merge "Remove reference to deleted gzip module" 2017-07-07 01:34:40 +00:00
Colin Cross b9e74ba400 Add test config for memunreachable_test 
Test: none
Change-Id: Ieb297a2fcece6365a074cd470b3ca56e2baea926
 2017-07-07 01:07:05 +00:00
Android Build Merger (Role) e62a5014b5 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp 2017-07-06 23:58:22 +00:00
Steven Moreland 86f70ccb9c Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp 
am: bb3d4e579c

Change-Id: Ia115b0b98ae996632436327181998ded3d877fb2
 2017-07-06 23:58:00 +00:00
Android Build Merger (Role) a9be33b6b5 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: bb3d4e579c" into oc-dr1-dev-plus-aosp 2017-07-06 23:57:49 +00:00
Android Build Merger (Role) 4911a79078 Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp 2017-07-06 23:57:32 +00:00
Steven Moreland bce71d4de3 Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp 
am: bb3d4e579c

Change-Id: Ia92f61b0d78d5b10b99f7330f96ebf1eeb59ae24
 2017-07-06 23:57:22 +00:00
Steven Moreland 25f10a0fe5 Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp 
am: b3341eef52

Change-Id: I05628e684c781d237e5274b0456a2a8281b96c54
 2017-07-06 23:57:04 +00:00
Android Build Merger (Role) 15c4cdf9da Merge "Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp am: b3341eef52" into oc-dr1-dev-plus-aosp 2017-07-06 23:56:49 +00:00
Android Build Merger (Role) 04d18ab666 Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp am: 7f895b1438" into oc-dr1-dev-plus-aosp 2017-07-06 23:56:34 +00:00
Steven Moreland 58e95f2ad8 Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp 
am: b3341eef52

Change-Id: I8f2a71ed881d6415a7f1fd22b5dfe384e8c21a10
 2017-07-06 23:56:23 +00:00
Steven Moreland 8ed203e6cc Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp 
am: 7f895b1438

Change-Id: I0f323f32a7037c23cee8aa872e282a2e953f5f09
 2017-07-06 23:56:09 +00:00
Steven Moreland 953f9670ac Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp 
am: 7f895b1438

Change-Id: I4b97549d48bd3cb802ff96e4118690b8c0b3e81a
 2017-07-06 23:55:08 +00:00
Steven Moreland 3d6bb82263 Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e 
am: d46cb65ce4

Change-Id: I4442a460d372eed07d4d7b74cd449d85fb03bbc0
 2017-07-06 23:54:03 +00:00
Android Build Merger (Role) bb3d4e579c Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp 2017-07-06 23:51:55 +00:00
Android Build Merger (Role) b3341eef52 Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp 2017-07-06 23:51:34 +00:00
Steven Moreland 18114a6493 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master 
am: b3c418e847

Change-Id: Ie9fa17a1f77b03687e626754291b6997856183ce
 2017-07-06 23:51:26 +00:00
Steven Moreland 2ae838ed16 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master 
am: b3c418e847

Change-Id: If5bf35ad8fd29c3cec6ecb9b9cb882fa86647053
 2017-07-06 23:51:07 +00:00
Android Build Merger (Role) 7f895b1438 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp 2017-07-06 23:51:02 +00:00
Steven Moreland a947566568 Merge "Move libnativebridge headers into the module." am: 508e0b8b34 
am: 1921ab7c0e

Change-Id: Ia1e83633a2b28a7fc15f96aaca31b57fcd183c3f
 2017-07-06 23:50:33 +00:00
Steven Moreland d46cb65ce4 Merge "Move libnativebridge headers into the module." am: 508e0b8b34 
am: 1921ab7c0e

Change-Id: I3d72c2338d0ad627ef1a1a639c3cc0700e2302fe
 2017-07-06 23:50:18 +00:00
Android Build Merger (Role) b3c418e847 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master 2017-07-06 23:47:59 +00:00
Steven Moreland a931c8aee5 Merge "Move libnativebridge headers into the module." 
am: 508e0b8b34

Change-Id: Ifb3e84ed0a059f10efe8e25595387a17c2b0ed46
 2017-07-06 23:47:31 +00:00
Steven Moreland 1921ab7c0e Merge "Move libnativebridge headers into the module." 
am: 508e0b8b34

Change-Id: I9135de5cbda05c9b4b686b0c6dda26c2d561d31e
 2017-07-06 23:46:57 +00:00
Treehugger Robot 508e0b8b34 Merge "Move libnativebridge headers into the module." 2017-07-06 23:36:34 +00:00
Andreas Gampe 19b8ab995e Merge "System/core: Remove include/ziparchive" am: ae590fe723 am: 10e80f3715 
am: 19fc21698b

Change-Id: I06d18e9443c1c15dfb3887df5ca874971f6a0243
 2017-07-06 23:33:56 +00:00
Andreas Gampe 19fc21698b Merge "System/core: Remove include/ziparchive" am: ae590fe723 
am: 10e80f3715

Change-Id: I585cb91604498e4b19d3706c231e586ffb1b5a10
 2017-07-06 23:10:24 +00:00
Steven Moreland 58b3c79034 libutils: liblog export headers 
- make liblog dependency for all library builds (this is required
    for files like String8.cpp)
- export liblog headers (because they are used in many header files).

Test: less libraries fail with BOARD_VNDK_VERSION := current
Merged-In: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
Change-Id: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
 2017-07-06 22:57:08 +00:00
Andreas Gampe 10e80f3715 Merge "System/core: Remove include/ziparchive" 
am: ae590fe723

Change-Id: I396b3cd0e642b3d65a1e0771a4ed8aec64128922
 2017-07-06 22:56:34 +00:00
Wei Wang 85681a27dd Merge "init: Support custom shutdown actions" into oc-dr1-dev 
am: cea7028cf4  -s ours

Change-Id: I9b56a7dcf7b6db24d2e2fcc405e99e389cee4497
 2017-07-06 22:49:11 +00:00
Treehugger Robot ae590fe723 Merge "System/core: Remove include/ziparchive" 2017-07-06 22:42:39 +00:00
Wei Wang cea7028cf4 Merge "init: Support custom shutdown actions" into oc-dr1-dev 2017-07-06 22:36:47 +00:00
Colin Cross 73c2ef4b87 Remove reference to deleted gzip module 
The gzip module was removed and replaced with an implementation in
toybox.  Remove the required modules reference.

Bug: 63400769
Change-Id: I032d7ddc59105b3c6fb87084983266655772756a
Test: m -j checkbuild
 2017-07-06 22:33:22 +00:00
Jin Qian f361c2560c init: require e2fsdroid and mke2fs when building init 
am: 041f849548

Change-Id: Icf49587d20a210cdcf130aacc25ecbcbfd31f06c
 2017-07-06 20:55:36 +00:00
Eric Biggers e9811f36e5 fs_mgr: set ext4 encryption flag with tune2fs when needed 
Upstream kernels (v4.9+, v4.4.67+) have started to enforce that
encryption policies cannot be set on ext4 directories unless
EXT4_FEATURE_INCOMPAT_ENCRYPT is set in the filesystem superblock, as
was the original design.  Since Android's userspace was not setting this
flag, it was not possible to use "file-based encryption" (FBE) on
devices whose kernels enforce this constraint.  Fix this by updating
fs_mgr to set the flag if needed, similar to how it enables the quota
feature if needed.

Note that it would, eventually, be simpler to set this flag at mkfs
time.  But that seems infeasible for now, given the many different ways
the userdata filesystem can be formatted --- including via 'fastboot',
which I believe is expected to still be compatible with old devices
whose kernel and/or e2fsprogs don't support the 'encrypt' flag.

Bug: 36231741
Change-Id: Ibafb9a7116fc853b62f8ee074a78499399f290a6
 2017-07-06 13:31:30 -07:00
Eric Biggers 8d3bcd4b6a fs_mgr: refactor pre-mount logic into prepare_fs_for_mount() 
There were several duplications in the code that runs before a
filesystem is mounted.  This made it difficult to start running tune2fs
to set the encryption feature flag.  Refactor to deduplicate the logic,
and improve the log messages.

Bug: 36231741
Change-Id: I90846dad9c5ec85b3c5460615dec4cc19cb7e198
 2017-07-06 13:31:30 -07:00
Jin Qian 041f849548 init: require e2fsdroid and mke2fs when building init 
init calls fs_mgr to format ext4 partitions. This requires
e2fsdroid and mke2fs in /system/bin/

Bug: 35219933
Change-Id: Ia32fe438cd9b9332f8e18e0cbe7f61bd050adcb1
 2017-07-06 11:45:06 -07:00
Steven Moreland b2b88e35ea Move libnativebridge headers into the module. 
Test: links
Change-Id: I2e19d1ba7845b4b3d3fee934fcb1c90151fd7192
 2017-07-06 11:23:16 -07:00
Keun-young Park 53d129cdf5 Merge "add "shutdown critical" to service" into oc-dr1-dev 
am: 3b15f44041

Change-Id: I7b70303637913a43d717bb206a2bd6be82c9781f
 2017-07-06 17:22:29 +00:00
Keun-young Park 3b15f44041 Merge "add "shutdown critical" to service" into oc-dr1-dev 2017-07-06 17:14:23 +00:00
Tom Cherry 98562ebdf7 Merge "init: add info logs in first stage mount if we have to poll" into oc-dr1-dev 
am: 7be26793eb  -s ours

Change-Id: I369435619caa17d312555453201809892865e842
 2017-07-06 16:28:11 +00:00
TreeHugger Robot 7be26793eb Merge "init: add info logs in first stage mount if we have to poll" into oc-dr1-dev 2017-07-06 16:15:11 +00:00
Android Build Merger (Role) 80043c7891 Merge "Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe -s ours" into oc-dr1-dev-plus-aosp 2017-07-06 16:07:55 +00:00
Jin Qian 64ba9e3e49 Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev 
am: 3d7422dbfe  -s ours

Change-Id: I1db69b31974703bd505ecd9bda9a253d887dbf5f
 2017-07-06 16:06:38 +00:00
Jin Qian f5135ce112 Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev 
am: 3d7422dbfe  -s ours

Change-Id: I6e83ad386fff41506b1529b39b2e5074de2fc62f
 2017-07-06 16:06:19 +00:00
TreeHugger Robot 3d7422dbfe Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev 2017-07-06 14:24:04 +00:00