Commit graph

35572 commits

Author SHA1 Message Date
Steve Muckle
c2548ea392 Merge "init: add support for global seccomp boot option" am: 9f1980e2fc am: 5a79972238 am: eb7db75c28
am: aa4bb9552f

Change-Id: I0b7c6112549b8cfba1f4069515d666534ee9e3e2
2017-07-25 20:36:49 +00:00
Steve Muckle
aa4bb9552f Merge "init: add support for global seccomp boot option" am: 9f1980e2fc am: 5a79972238
am: eb7db75c28

Change-Id: I5fabba13d6b269ffca8731fc83dbd590ae388239
2017-07-25 20:33:53 +00:00
Steve Muckle
eb7db75c28 Merge "init: add support for global seccomp boot option" am: 9f1980e2fc
am: 5a79972238

Change-Id: Ide7500d4ff4d9eebf2fea1d81ff77044a6d63c57
2017-07-25 20:30:30 +00:00
Steve Muckle
5a79972238 Merge "init: add support for global seccomp boot option"
am: 9f1980e2fc

Change-Id: I35532202b360ef32cdb21c048cd3d2e1139b7d67
2017-07-25 20:26:29 +00:00
Treehugger Robot
9f1980e2fc Merge "init: add support for global seccomp boot option" 2017-07-25 20:18:51 +00:00
Narayan Kamath
cc1f85a49a Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev am: 53ce94588b -s ours
am: 8df2973166  -s ours

Change-Id: I63338c59f4c27efeccb29ebfc98ddac826ccc439
2017-07-25 15:21:37 +00:00
Narayan Kamath
35060e1034 Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev am: 53ce94588b -s ours
am: 385a5dc03a  -s ours

Change-Id: I59df897bad916cf7facd62469e11c05f977ed3dd
2017-07-25 15:17:24 +00:00
Narayan Kamath
8df2973166 Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev
am: 53ce94588b  -s ours

Change-Id: Ia2e6b86fbe5096b9419511edf7c3baf78e8aaee5
2017-07-25 15:13:24 +00:00
Narayan Kamath
385a5dc03a Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev
am: 53ce94588b  -s ours

Change-Id: I5fce7331aae05080d8a68155500ebda45dfe7246
2017-07-25 15:13:24 +00:00
TreeHugger Robot
53ce94588b Merge "DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket." into oc-dr1-dev 2017-07-25 15:05:01 +00:00
Narayan Kamath
ed218dd556 DO NOT MERGE ANYWHERE tombstoned: Avoid creating the tombstoned_java_trace socket.
Its use is hard-wired off by default. This fixes an SELinux
denial when init tries to create it. We see a denail because
the SELinux aspects of these changes have been reverted on DR
because it's the same API level as oc-dev.

Test: manual
Bug: 63350870

Change-Id: I8b18a25bc14ad9cf79825596ce70483530dd3a8b
2017-07-25 13:17:01 +01:00
Wei Wang
e846e665ba init: Fire shutdown trigger for thermal shutdown am: 63a1d0a5f9
am: da4e68944e

Change-Id: Ie8edf568678ea2c629df27e5d8fa15430f68891c
2017-07-25 00:25:32 +00:00
Wei Wang
719622c731 init: Fire shutdown trigger for thermal shutdown am: 63a1d0a5f9
am: 5721e78e24

Change-Id: I9a16b784962ff20769007ee91c83afd7756c46ba
2017-07-25 00:21:00 +00:00
Wei Wang
da4e68944e init: Fire shutdown trigger for thermal shutdown
am: 63a1d0a5f9

Change-Id: I1355e32c56947a79666eb3a58d9299042171a25c
2017-07-25 00:17:29 +00:00
Wei Wang
5721e78e24 init: Fire shutdown trigger for thermal shutdown
am: 63a1d0a5f9

Change-Id: Id38327977f944071063b97a19b4889a903f94eda
2017-07-25 00:17:28 +00:00
Wei Wang
2257815813 Merge "init: Fire shutdown trigger for thermal shutdown" am: 603cae8b48 am: b0a6129c43 am: fc2f0a0ce7
am: 9a63ee349d

Change-Id: I6e44b248c79a7472bea4557fc55bbf79733ecd14
2017-07-24 22:27:50 +00:00
Wei Wang
9a63ee349d Merge "init: Fire shutdown trigger for thermal shutdown" am: 603cae8b48 am: b0a6129c43
am: fc2f0a0ce7

Change-Id: I1611d973239dd15b01799fc21bdc812dfacc8036
2017-07-24 22:20:19 +00:00
Wei Wang
fc2f0a0ce7 Merge "init: Fire shutdown trigger for thermal shutdown" am: 603cae8b48
am: b0a6129c43

Change-Id: I3f88302f280809e9df98dc55dd2ca6ebd269e7bb
2017-07-24 22:17:50 +00:00
Wei Wang
b0a6129c43 Merge "init: Fire shutdown trigger for thermal shutdown"
am: 603cae8b48

Change-Id: I0bbd26f22887afcf7b2145b78239c9f8e2c45047
2017-07-24 22:15:20 +00:00
Treehugger Robot
603cae8b48 Merge "init: Fire shutdown trigger for thermal shutdown" 2017-07-24 22:09:37 +00:00
Wei Wang
63a1d0a5f9 init: Fire shutdown trigger for thermal shutdown
Recent change in init has bring normal shutdown sequence in
thermal-shutdown condition. This CL will make sure init fire shutdown
trigger where holds custom shutdown actions for vendor SoC/platform.

(cherry picked from commit 1be2212319)

Bug: 63686426
Test: adb shell setprop sys.powerctl thermal-shutdown
Change-Id: Ieb8579fdf9c30c1a81d60466a7375c9784f3ca98
2017-07-24 14:59:52 -07:00
Steve Muckle
af1a9bfb8f init: add support for global seccomp boot option
Setting androidboot.seccomp=global on the kernel command line shall
enable seccomp for all processes rather than just in zygote. Doing
this has a performance impact, for now it shall just be used to audit
syscall usage during testing.

Bug: 37960259
Change-Id: I6b9fc95e9bec5e2bcfe6ef0b4343a5b422e30152
2017-07-24 13:33:54 -07:00
Wei Wang
1be2212319 init: Fire shutdown trigger for thermal shutdown
Recent change in init has bring normal shutdown sequence in
thermal-shutdown condition. This CL will make sure init fire shutdown
trigger where holds custom shutdown actions for vendor SoC/platform.

Bug: 63686426
Test: adb shell setprop sys.powerctl thermal-shutdown
Change-Id: Ieb8579fdf9c30c1a81d60466a7375c9784f3ca98
2017-07-24 13:12:22 -07:00
Tom Cherry
e4e6f3a6e6 Merge "init: use delegating constructor for Service" am: ce3b2de809 am: 9549d6889a am: d78477cf59
am: 78f18a3e37

Change-Id: I14f4510b05990778946c26048640048bbd333fcf
2017-07-24 16:43:18 +00:00
Tom Cherry
78f18a3e37 Merge "init: use delegating constructor for Service" am: ce3b2de809 am: 9549d6889a
am: d78477cf59

Change-Id: I9f43b6f3a35ff831efb4c7feb7f6cc27866bce31
2017-07-24 16:38:51 +00:00
Tom Cherry
d78477cf59 Merge "init: use delegating constructor for Service" am: ce3b2de809
am: 9549d6889a

Change-Id: I5b2c03c405b8261a2613905d8597c58b73ca4bb9
2017-07-24 16:33:03 +00:00
Tom Cherry
9549d6889a Merge "init: use delegating constructor for Service"
am: ce3b2de809

Change-Id: Ic9bd63b44f57b505b1cd379948786349e92c0c45
2017-07-24 16:27:35 +00:00
Tom Cherry
ce3b2de809 Merge "init: use delegating constructor for Service" 2017-07-24 16:19:46 +00:00
Keun-young Park
32d8adf637 Merge "fs_mgr:Add filter condition to make sure that the super block is correct." am: 9dd1a12b1e am: bc4c5032fc am: 29a5cc174c
am: 2eba1eb7d2

Change-Id: Iab8f87b34561b36ab9bf73fd1bb8662084717808
2017-07-21 22:48:56 +00:00
Jin Qian
41cc0be643 Merge changes from topic 'mke2fs_2' am: 176827e166 am: 3f531ac5cf am: 998de96766
am: 2091e3a55a

Change-Id: I08ad815a960114bc54e03523a7b2c84aeef05947
2017-07-21 22:47:21 +00:00
Keun-young Park
2eba1eb7d2 Merge "fs_mgr:Add filter condition to make sure that the super block is correct." am: 9dd1a12b1e am: bc4c5032fc
am: 29a5cc174c

Change-Id: I84223b5e0cb7bda24cc62377ed88b027b81169f8
2017-07-21 22:46:37 +00:00
Jin Qian
2091e3a55a Merge changes from topic 'mke2fs_2' am: 176827e166 am: 3f531ac5cf
am: 998de96766

Change-Id: Id2aaaa806f8ad741dd4310881ba3038c0ff2fcd8
2017-07-21 22:44:58 +00:00
Keun-young Park
29a5cc174c Merge "fs_mgr:Add filter condition to make sure that the super block is correct." am: 9dd1a12b1e
am: bc4c5032fc

Change-Id: I8c0504873552f9f1cf1f1af44ed0e245172e22bf
2017-07-21 20:13:52 +00:00
Keun-young Park
bc4c5032fc Merge "fs_mgr:Add filter condition to make sure that the super block is correct."
am: 9dd1a12b1e

Change-Id: I8947564ee32cd90ea8f3a7c986426b9c3dbd70af
2017-07-21 20:11:52 +00:00
Keun-young Park
9dd1a12b1e Merge "fs_mgr:Add filter condition to make sure that the super block is correct." 2017-07-21 20:04:15 +00:00
Tom Cherry
5d17d044c7 init: use delegating constructor for Service
Test: init unit tests
Change-Id: Ida0be6195a3675bfca3d979db03855b45417b11e
2017-07-21 12:42:07 -07:00
Jin Qian
998de96766 Merge changes from topic 'mke2fs_2' am: 176827e166
am: 3f531ac5cf

Change-Id: Ic83be85a8955df27adf84e9ab9a2c5e40c0166e5
2017-07-21 19:10:35 +00:00
Jin Qian
3f531ac5cf Merge changes from topic 'mke2fs_2'
am: 176827e166

Change-Id: I933e0d96d9c81c5800e4cf406582277b140f3e2b
2017-07-21 19:06:03 +00:00
Treehugger Robot
176827e166 Merge changes from topic 'mke2fs_2'
* changes:
  fastboot: add mke2fs and e2fsdroid to build package
  fastboot: call mke2fs tools to generate ext4 image
  fs_mgr: call format_f2fs correctly with -f
  init: require e2fsdroid and mke2fs when building init
  init: rename mke2fs tools with _static suffix
2017-07-21 19:00:46 +00:00
Jin Qian
3fdf5eca70 fastboot: add mke2fs and e2fsdroid to build package
Bug: 23686092
Bug: 63849632
Change-Id: Iff0d92b7174597d43ee646847888aedc2080052a
(cherry picked from commit 6ce78321a2)
2017-07-21 12:00:16 -07:00
Jin Qian
4afba66781 fastboot: call mke2fs tools to generate ext4 image
Set MKE2FS_CONFIG to empty to use mke2fs default configs

Test: fastboot --wipe-and-use-fbe
Bug: 35219933
Change-Id: Ibc97bb125899e1f1fe820d53709fdb2ab291c171
(cherry picked from commit d14d7c14cb)
2017-07-21 12:00:16 -07:00
katao
4e8d73fa0c fs_mgr:Add filter condition to make sure that the super block is correct.
Because full disk encryption make surper block is not except contents. Only
judge the magic number can prevent most of encrypted surper block.
In particular, magic number plaintext may be equal ciphertext. In order to
avoid this situation, we add the judgment of adaptive situation of the
s_rev_level, s_log_block_size and EXT4_INODE_SIZE.

Test: 1. Config fstab,userdata add flags: forceencrypt=footer,reservedsize=128M
      2. build a new target files, and flash all image.
      3. Config encrypt userdata surperblock,set magic number is 0xEF53
      4. reboot system and check log of fs_mgr.
Change-Id: I925584d58f17afabbb3aa91f8be2302518172bb2
Signed-off-by: katao <katao@xiaomi.com>
2017-07-21 11:35:35 +08:00
Jaegeuk Kim
c0d88edfec fs_mgr: call format_f2fs correctly with -f
This patch formats f2fs with -f option.

Change-Id: I3fc415f35d81f22cbf1eadebc619465d36205927
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
(cherry picked from commit 0331c2cf77)
2017-07-20 11:54:47 -07:00
Jin Qian
00456978a2 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
(cherry picked from commit 041f849548)
2017-07-20 11:54:02 -07:00
Jin Qian
278b15c84c init: rename mke2fs tools with _static suffix
We build a static version for recovery mode. Give them
different names to avoid conflicts with regular version
in /system/bin/

Bug: 35219933
Change-Id: I738655ad9b9ad71c63ae604d9a4d659b0b671121
(cherry picked from commit a2421041bf)
2017-07-20 11:53:44 -07:00
Jiyong Park
18ebf814ef Add [test] section for /data/[nativetest|benchmarktest] am: c034a43d44
am: 7847934b8a

Change-Id: I6fa8ba461c884cbf1621d81c2257640c9e8315a0
2017-07-20 17:39:23 +00:00
Jiyong Park
3ef05e61ea Add [test] section for /data/[nativetest|benchmarktest] am: c034a43d44
am: 342e022547

Change-Id: Ia7a6e7b76031b68217cabd75b74761fd842d903a
2017-07-20 17:38:30 +00:00
Jiyong Park
342e022547 Add [test] section for /data/[nativetest|benchmarktest]
am: c034a43d44

Change-Id: I11b98ea29bbba4c3bc29f28fe7ba9864306245dd
2017-07-20 17:34:30 +00:00
Jiyong Park
7847934b8a Add [test] section for /data/[nativetest|benchmarktest]
am: c034a43d44

Change-Id: Ib068a73923a167f46368ea2adda9ff6625c7fcee
2017-07-20 17:34:29 +00:00
Jiyong Park
c034a43d44 Add [test] section for /data/[nativetest|benchmarktest]
We have both system and vendor tests in the same directory
/data/nativetest. Since we can't distinguish system and vendor tests at
runtime, we choose to run all of them with the legacy namespace
configuration where /system/lib and /vendor/lib are both accessible
without any restriction. Furthermore, /system/lib/vndk-sp is added to
the list of accessible directories for tests since some libs (such as
libion.so) exist only in the directory but not in /system/lib.

This will change in the future when we install system and vendor tests
into different directories (vendor tests goes into ./vendor subdir).
Then, we will run the tests with [system] or [vendor] configurations
depending on their paths.

Bug: 63597267
Test: run bionic-unit-tests
Test: run linker-unit-tests
Change-Id: I810003b2da0b30335200c130f484ea7b041f9f80
2017-07-20 15:28:00 +09:00