Commit graph

35457 commits

Author SHA1 Message Date
Robert Benea
9865760d3d Merge "Add memcg related configs to init." am: b84666cbc0 am: 7564622f88 am: 5cf308bcde
am: eab1c14aba

Change-Id: I357cef77e7e48fdda55d55dbaeac531e0974a434
2017-07-19 01:22:40 +00:00
Robert Benea
eab1c14aba Merge "Add memcg related configs to init." am: b84666cbc0 am: 7564622f88
am: 5cf308bcde

Change-Id: Ic86a3200b5080438ad6cb33f9bc3f6ff2ecca22b
2017-07-19 01:12:40 +00:00
Robert Benea
5cf308bcde Merge "Add memcg related configs to init." am: b84666cbc0
am: 7564622f88

Change-Id: Ia9f5b5d524eb437598e9d453ca05e35d52445cc1
2017-07-19 01:03:32 +00:00
Robert Benea
7564622f88 Merge "Add memcg related configs to init."
am: b84666cbc0

Change-Id: I437c5d05582c6a3cce632f92835ee91f419a7190
2017-07-19 01:01:27 +00:00
Robert Benea
b84666cbc0 Merge "Add memcg related configs to init." 2017-07-19 00:54:41 +00:00
Jiyong Park
5dcd83c6a0 Merge "/data/nativetest[64] processes are running with the new ns config" into oc-dr1-dev am: c5aba9702e
am: df13c1473d

Change-Id: I42d01009bef11774a3a1c7e22771d9ef72f8f39d
2017-07-19 00:42:15 +00:00
Jiyong Park
df13c1473d Merge "/data/nativetest[64] processes are running with the new ns config" into oc-dr1-dev
am: c5aba9702e

Change-Id: Icf29b590738b6e3287b3635d352fe2c01d185fd8
2017-07-19 00:29:51 +00:00
TreeHugger Robot
c5aba9702e Merge "/data/nativetest[64] processes are running with the new ns config" into oc-dr1-dev 2017-07-19 00:25:33 +00:00
Quang Luong
559674dbe3 Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" am: a022ea424d am: c1e78e1331 am: be2a262b47
am: 6bcf4fb8b5

Change-Id: I1b6656bc4ec0dbebccb4fe92c6f73f9be6965353
2017-07-18 23:24:51 +00:00
Robert Benea
d485226951 Add memcg related configs to init.
Allow configuring memory.swappiness, memory.soft_limit_in_bytes
and memory.limit_in_bytes by init; by doing so there is better
control of memory consumption per native app.

Test: tested on gobo branch.
bug: 63765067
Change-Id: I8906f3ff5ef77f75a0f4cdfbf9d424a579ed52bb
2017-07-18 15:58:40 -07:00
Quang Luong
6bcf4fb8b5 Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" am: a022ea424d am: c1e78e1331
am: be2a262b47

Change-Id: I223ebf56a8bbefb38735ebbcfe45c7d2a78cd50c
2017-07-18 22:39:00 +00:00
Tom Cherry
3502a5357e Merge "Remove ALOGD_IF_SLOW" am: d13547347f -s ours am: b20ff457f0 -s ours am: 852a6cd623 -s ours
am: 61aaf75202  -s ours

Change-Id: I35063f11dece7ad8d40dbfd0ab4b423918ce4916
2017-07-18 22:22:33 +00:00
Tom Cherry
61aaf75202 Merge "Remove ALOGD_IF_SLOW" am: d13547347f -s ours am: b20ff457f0 -s ours
am: 852a6cd623  -s ours

Change-Id: I5a41014c62dd9c2a9c477e369007e8c5c6ce41e7
2017-07-18 22:03:44 +00:00
Quang Luong
be2a262b47 Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" am: a022ea424d
am: c1e78e1331

Change-Id: I81d4f619f38a6f511562d98fe7a0dd64c7290f81
2017-07-18 21:26:19 +00:00
Quang Luong
c1e78e1331 Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp"
am: a022ea424d

Change-Id: Ie4b2131525373fef14dfa2c7a7ec1e23a50dc56a
2017-07-18 21:20:26 +00:00
Treehugger Robot
a022ea424d Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" 2017-07-18 21:16:30 +00:00
Keun-young Park
111fe96a8c Do not umount /vendor, /system, and /oem even if they are R/W. am: 45ae1b2754
am: 13dfe79028

Change-Id: I2cc0d5d6cd19949bb5d9ae537871faf475afd798
2017-07-18 21:02:22 +00:00
Keun-young Park
13dfe79028 Do not umount /vendor, /system, and /oem even if they are R/W.
am: 45ae1b2754

Change-Id: I6771f2e77f382662b4f17575d5b651c5cd0c3233
2017-07-18 20:58:51 +00:00
TreeHugger Robot
178f0472d7 Merge "fastboot: call mke2fs tools to generate ext4 image" 2017-07-18 20:36:27 +00:00
Tom Cherry
852a6cd623 Merge "Remove ALOGD_IF_SLOW" am: d13547347f -s ours
am: b20ff457f0  -s ours

Change-Id: Ia4fbc86830f36ef483eacd66f621c114f5ffad95
2017-07-18 20:23:25 +00:00
Tom Cherry
b20ff457f0 Merge "Remove ALOGD_IF_SLOW"
am: d13547347f  -s ours

Change-Id: Iecd8ed7045e1f38a3cb87ab856ca2708bf86de14
2017-07-18 20:04:46 +00:00
Jin Qian
d14d7c14cb 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
2017-07-18 11:48:19 -07:00
Quang Luong
dd6a85ccd5 uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp
Modified Android.mk to define cflag "USER_MODE_LINUX" if
TARGET_USER_MODE_LINUX := true in BoardCofig.mk.
Modified set_mmap_rnd_bits_action to return 0 if "USER_MODE_LINUX" is
defined. This is needed since uml does not support the mmap_rnd_bits
sysctl, and init would otherwise crash without this check.

Test: manual

Bug: 32523022
Change-Id: I409ef64a1fa253bfb3f9fb59d0267be159819bb8
Signed-off-by: Quang Luong <qal@google.com>
2017-07-18 18:18:31 +00:00
Keun-young Park
45ae1b2754 Do not umount /vendor, /system, and /oem even if they are R/W.
- /vendor, /system, /oem can be remounted to R/W for development
  purpose.

- In such case, umounting these partitions can lead into some processes
  not running properly during shutdown or blocking umount of fs.

- So skip them. As it is dev feature, it is up to each developer to
  understand the risk. But for normal adb sync - reboot should be ok
  as shutdown involves sync operations.

bug: 37737296
Test: adb remount,reboot, and check last kmsg

(cherry picked from commit 6e12b3887e)

Change-Id: Ia92a20aa672e68f695818e451ba2ae53af8f5ab9
2017-07-18 10:32:27 -07:00
Tom Cherry
d13547347f Merge "Remove ALOGD_IF_SLOW" 2017-07-18 17:20:39 +00:00
TreeHugger Robot
6651aa741e Merge "Remove ScopedLogSeverity for debugging" 2017-07-18 08:08:34 +00:00
Jiyong Park
9d1e50b809 /data/nativetest[64] processes are running with the new ns config
Native tests under /data/nativetest[64] directory is now running with
the same linker namespace configuration as /system/bin/* processes.

This allows us to stop mimicing the linker namespace configuration of the
/system/bin/* processes using LD_LIBRARY_PATH.

Bug: 63597267
Test: run bionic-unit-tests
Test: run linker-unit-tests
Change-Id: If8e2ed0b8016e4e07bf6829735b8e02f952042d0
2017-07-18 16:45:05 +09:00
Keun-young Park
29017c10c8 Merge "Do not umount /vendor, /system, and /oem even if they are R/W." am: 11649e8925 am: c9f601a178 am: 10b74ed2a6
am: ab54410f0d

Change-Id: Ic0d033d955e2612157dc63922ee85d4722bc9fa6
2017-07-18 03:21:07 +00:00
Keun-young Park
ab54410f0d Merge "Do not umount /vendor, /system, and /oem even if they are R/W." am: 11649e8925 am: c9f601a178
am: 10b74ed2a6

Change-Id: Ie0339f41eb166e156ab61133e6a2c19e4bbd28a2
2017-07-18 03:18:07 +00:00
Keun-young Park
10b74ed2a6 Merge "Do not umount /vendor, /system, and /oem even if they are R/W." am: 11649e8925
am: c9f601a178

Change-Id: Ia5f3096e339ed8d088482c5c11ed5e5b906e9205
2017-07-18 03:15:36 +00:00
Keun-young Park
c9f601a178 Merge "Do not umount /vendor, /system, and /oem even if they are R/W."
am: 11649e8925

Change-Id: I1b4db022ca316648dfccfa12c3f8e886e6b15b08
2017-07-18 03:12:37 +00:00
TreeHugger Robot
35b5e264d5 Merge "Add sys/cdefs.h to log/log_main.h." 2017-07-18 03:10:40 +00:00
Treehugger Robot
11649e8925 Merge "Do not umount /vendor, /system, and /oem even if they are R/W." 2017-07-18 03:08:42 +00:00
Bowgo Tsai
5284e433d0 Merge "adbd: lessen security constraints when the device is unlocked" am: e03665142e am: 0fe0ced23c am: 620f6e65b3
am: 9679967dac

Change-Id: Ife980c83b5424d7549eac2cebc047f1628507a14
2017-07-18 02:48:04 +00:00
Bowgo Tsai
9679967dac Merge "adbd: lessen security constraints when the device is unlocked" am: e03665142e am: 0fe0ced23c
am: 620f6e65b3

Change-Id: I532c68a077019cbf133db5cbdcf967509415687b
2017-07-18 02:45:06 +00:00
Bowgo Tsai
620f6e65b3 Merge "adbd: lessen security constraints when the device is unlocked" am: e03665142e
am: 0fe0ced23c

Change-Id: I5998cf88d64184df463d5b363efd6af618c19674
2017-07-18 02:42:03 +00:00
Bowgo Tsai
0fe0ced23c Merge "adbd: lessen security constraints when the device is unlocked"
am: e03665142e

Change-Id: Iae19ade154c0d584268a8b035ea0ed90ceb537b4
2017-07-18 02:39:35 +00:00
Treehugger Robot
e03665142e Merge "adbd: lessen security constraints when the device is unlocked" 2017-07-18 02:36:12 +00:00
Yifan Hong
79b1a3027b Add sys/cdefs.h to log/log_main.h.
for liblog.vendor. __ANDROID_API__ is __ANDROID_API_FUTURE__
with BOARD_VNDK_VERSION=current, so we need it defined.

Bug: 33241851
Test: BOARD_VNDK_VERSION=current m libgui.vendor
      (that uses liblog.vendor)

Change-Id: I340ec048094c027828f516d891250651e0c88eea
2017-07-17 17:59:35 -07:00
TreeHugger Robot
897ef5298d Merge "storaged: record userdata space utilization" 2017-07-18 00:46:02 +00:00
Bowgo Tsai
f1d3dbc32f adbd: lessen security constraints when the device is unlocked
ALLOW_ADBD_ROOT ('adb root') and ALLOW_ADBD_NO_AUTH (ro.adb.secure = 0)
are false in user build. This prevents a non-A/B device from running
Treble VTS because it requires 'adb root'. Without ALLOW_ADBD_NO_AUTH,
adb still can work if ro.adb.secure = 1. However, allowing it to be 0
is better for test automation.

The image combination in VTS is:
  - system.img (userdebug): provided by Googlg
  - boot.img (user): provided by the OEM  <-- adbd is here
  - vendor.img (user): provided by the OEM

This change allows 'adb root' and 'ro.adb.secure = 0' when the device is
unlocked in user build. No changes for userdebug/eng builds.

Note that the device must be unlocked when running VTS. Otherwise,
verified boot will prevent it from booting the system.img provided by
Google (no verity metadata).

Bug: 63313955
Bug: 63381692
Test: use the above image combination, check 'adb root' and
      'ro.adb.secure = 0' can work

Change-Id: I109d96c950e54c4fb0ac0c98b989a20593681e52
2017-07-18 08:41:19 +08:00
Steven Moreland
7473bc7b4d Merge "Revert "Mark libmetricslogger vendor_available."" am: 420eabe3b3 am: bd9bec463f am: 4dae73a2c6
am: 2af4e88e70

Change-Id: I86ff62c1d850a4ce248028d85501b81e615d2bb5
2017-07-18 00:37:22 +00:00
Steven Moreland
2af4e88e70 Merge "Revert "Mark libmetricslogger vendor_available."" am: 420eabe3b3 am: bd9bec463f
am: 4dae73a2c6

Change-Id: Iebdce7328e3562554a676153d9e805f81031ecc5
2017-07-18 00:32:55 +00:00
Keun-young Park
6e12b3887e Do not umount /vendor, /system, and /oem even if they are R/W.
- /vendor, /system, /oem can be remounted to R/W for development
  purpose.

- In such case, umounting these partitions can lead into some processes
  not running properly during shutdown or blocking umount of fs.

- So skip them. As it is dev feature, it is up to each developer to
  understand the risk. But for normal adb sync - reboot should be ok
  as shutdown involves sync operations.

bug: 37737296
Test: adb remount,reboot, and check last kmsg
Change-Id: Iab6a6374bc558375d359b3b49b14db93d363b1ad
2017-07-17 17:32:26 -07:00
Steven Moreland
4dae73a2c6 Merge "Revert "Mark libmetricslogger vendor_available."" am: 420eabe3b3
am: bd9bec463f

Change-Id: Ica0793d4040393cbf9337f29b5cadb8d7af4ac91
2017-07-18 00:28:23 +00:00
Steven Moreland
bd9bec463f Merge "Revert "Mark libmetricslogger vendor_available.""
am: 420eabe3b3

Change-Id: I63d3abb5a5e3b0adc33992ae35567ead6278c919
2017-07-18 00:23:53 +00:00
Treehugger Robot
420eabe3b3 Merge "Revert "Mark libmetricslogger vendor_available."" 2017-07-18 00:14:41 +00:00
Jin Qian
8847c62579 storaged: record userdata space utilization
Update disk space utilization together with diskstats since we will
use free space size to co-relate disk performance.

Bug: 63629306
Change-Id: I4e5694aaff3b71aa56db451f1bc92ccfb07e5086
2017-07-17 15:51:30 -07:00
Tom Cherry
bbd8b8b534 Merge "ueventd: add tests for setegid()/setfscreatecon() and threads" am: 0ba56096d5 am: 730a5ddf27 am: 92b34b76b5
am: 643307dbd0

Change-Id: Ibd08ed409511c9f32b41981a7a653459dd50f72c
2017-07-17 20:04:37 +00:00
Tom Cherry
643307dbd0 Merge "ueventd: add tests for setegid()/setfscreatecon() and threads" am: 0ba56096d5 am: 730a5ddf27
am: 92b34b76b5

Change-Id: I07b8b06af95c0c0bf8889dce0f256bb901264bcc
2017-07-17 20:01:06 +00:00