Commit graph

45168 commits

Author SHA1 Message Date
Josh Gao
134576deba Merge "adbd: compile for host."
am: b42946a6d3

Change-Id: Ib47212e298198fcd7f2a4be7f158c313a6e321d5
2019-01-24 14:09:29 -08:00
Josh Gao
b42946a6d3 Merge "adbd: compile for host." 2019-01-24 21:53:26 +00:00
Yabin Cui
eb16021d1e Merge "Add setuid/setgid capabilities to simpleperf_app_runner."
am: c87d1ed611

Change-Id: I4d03b065dd379cffbe5ca9656c3294a7f3675887
2019-01-24 11:05:26 -08:00
Sandeep Patil
40a307f530 Merge "meminfo: Add support to track working set with idle page tracking."
am: c1a6554391

Change-Id: If852cb6aab24a082f384f8d809e30e900049892e
2019-01-24 11:04:14 -08:00
Yabin Cui
c87d1ed611 Merge "Add setuid/setgid capabilities to simpleperf_app_runner." 2019-01-24 18:39:13 +00:00
Treehugger Robot
c1a6554391 Merge "meminfo: Add support to track working set with idle page tracking." 2019-01-24 18:25:10 +00:00
Mark Salyzyn
5bfde143d2 Merge "fs_mgr: overlayfs: test: test mount -o rw,remount command"
am: be38989da0

Change-Id: I562f5fa50e69e09a915eb8a370bbb89969b0e2b8
2019-01-24 08:35:12 -08:00
Treehugger Robot
be38989da0 Merge "fs_mgr: overlayfs: test: test mount -o rw,remount command" 2019-01-24 16:26:58 +00:00
Bowgo Tsai
035e2855db Merge "libfs_avb: support loading vbmeta structs from any partition"
am: 8dd6e5922b

Change-Id: If427c749caaa10b1c5f2bf2c239c982175f37806
2019-01-24 08:26:06 -08:00
Treehugger Robot
8dd6e5922b Merge "libfs_avb: support loading vbmeta structs from any partition" 2019-01-24 16:16:13 +00:00
Christopher Ferris
e0e04a49aa Merge "Fix memory leak in UnwinderFromPid object."
am: 3c1d6b836a

Change-Id: Ib56d1540c6a9835cb05084ddf66abfbfe44881da
2019-01-24 07:31:56 -08:00
Christopher Ferris
3c1d6b836a Merge "Fix memory leak in UnwinderFromPid object." 2019-01-24 15:23:09 +00:00
Jiyong Park
8e206db77b Merge "Add search paths for asan build"
am: 6b6259a083

Change-Id: I2da933c3bb0d408bc6828fe9f8bd51fc4cd58f9d
2019-01-24 04:33:45 -08:00
Treehugger Robot
6b6259a083 Merge "Add search paths for asan build" 2019-01-24 12:23:36 +00:00
LongPing Wei
52389e07c7 Merge "Do SetUpDmVerity only once for the same mount point"
am: 24a2c1a70c

Change-Id: I808ffa081b79a1e82652b749fbc227a0c892a01c
2019-01-24 03:29:02 -08:00
Treehugger Robot
24a2c1a70c Merge "Do SetUpDmVerity only once for the same mount point" 2019-01-24 11:06:03 +00:00
Neil Fuller
9ce21c1911 Merge "Add a symlink for the ICU .dat file"
am: 792fd03955

Change-Id: I448e65f17ed1d01a79646ce2b6c5f23293b3fc46
2019-01-24 02:13:34 -08:00
Neil Fuller
792fd03955 Merge "Add a symlink for the ICU .dat file" 2019-01-24 10:02:26 +00:00
Bowgo Tsai
278749d74c libfs_avb: support loading vbmeta structs from any partition
This commits adds the following two public functions into
class AvbHandle, and verified by 'libfs_avb_test':

static AvbUniquePtr LoadAndVerifyVbmeta();  // loads inline vbmeta.
static AvbUniquePtr LoadAndVerifyVbmeta(    // loads offline vbmeta.
    const std::string& partition_name, const std::string& ab_suffix,
    const std::string& ab_other_suffix, const std::string& expected_public_key,
    const HashAlgorithm& hash_algorithm, bool allow_verification_error,
    bool load_chained_vbmeta, bool rollback_protection,
    std::function<std::string(const std::string&)> custom_device_path = nullptr);

The first function LoadAndVerifyVbmeta() will be used to replace Open(),
in a separate CL in the future. Many libfs_avb internal utils are added
into avb_util.cpp as well, which are verified by
'libfs_avb_internal_test'.

Bug: 112103720
Bug: 117960205
Test: atest libfs_avb_test
Test: atest libfs_avb_internal_test
Change-Id: I807b8af0b69c9a4511f6f120e9754aca5442830e
2019-01-24 17:43:25 +08:00
Suren Baghdasaryan
68de855630 Merge changes from topic "revert move sched_policy functions"
am: 7e15ad7ecb

Change-Id: Id58a376e5e0216cf01ce201ed3061d5b8d7e8d5b
2019-01-23 23:13:38 -08:00
Suren Baghdasaryan
88fe832bd1 [automerger skipped] DO NOT MERGE: Revert "Add libprocessgroup into VNDK"
am: c4a02d25a9 -s ours
am skip reason: subject contains skip directive

Change-Id: I9131c17d5fc372db05699f1aca5138fba1237c7a
2019-01-23 23:08:47 -08:00
Suren Baghdasaryan
7e15ad7ecb Merge changes from topic "revert move sched_policy functions"
* changes:
  DO NOT MERGE: Revert "Add libprocessgroup into VNDK"
  DO NOT MERGE: Revert "libcutils: Move sched_policy functions into libprocessgroup"
  DO NOT MERGE: Revert "Add dependencies on libprocessgroup for sched_policy users"
2019-01-24 06:57:55 +00:00
Sandeep Patil
061b71339c meminfo: Add support to track working set with idle page tracking.
Also adds a tool to make use of this if it exists call 'wsstop'

Bug: 111694435
Test: wsstop -d 3 -n 100 1

Change-Id: I50415f0bdc09c09b5b414cf0e4fff8f2907c5823
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-23 22:53:46 -08:00
Jiyong Park
59e355c441 Add search paths for asan build
Bug: 123292626
Test: aosp_cf_x86_pasan boots
Change-Id: Ifdc86285cbb2d7eb2b1e39983981e7b81aec59c9
2019-01-24 15:08:06 +09:00
Hridya Valsaraju
91e94c1f19 Merge "Modify mkbootimg.py to support boot image header version 2"
am: ed3f1a584a

Change-Id: I0e68ac2fa5c0fe25e5e479e411586cfd2c2f6a35
2019-01-23 21:38:25 -08:00
Treehugger Robot
ed3f1a584a Merge "Modify mkbootimg.py to support boot image header version 2" 2019-01-24 05:33:53 +00:00
Suren Baghdasaryan
c4a02d25a9 DO NOT MERGE: Revert "Add libprocessgroup into VNDK"
This reverts commit dad4749731.

Reason for revert: Broke AOSP

Change-Id: I019e1226a65b31495984cf47ad471771b4880c45
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-23 20:44:47 -08:00
Suren Baghdasaryan
b5394db682 DO NOT MERGE: Revert "libcutils: Move sched_policy functions into libprocessgroup"
This reverts commit facd40d0e1.

Reason for revert: Broke AOSP

Change-Id: Id333417d4970ced800ab801bddfed880cafa056d
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-23 20:44:09 -08:00
Suren Baghdasaryan
1bef8c550c DO NOT MERGE: Revert "Add dependencies on libprocessgroup for sched_policy users"
This reverts commit 02843339f9.

Reason for revert: Broke AOSP

Change-Id: I62f91c0adf440b5da0a145862b04dd27a7016faf
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-23 20:43:28 -08:00
David Anderson
593109f5ca Merge "Expose IsFilePinned through FiemapWriter."
am: c98b1efd4c

Change-Id: Ib9c9b8cc0d91da4b9354776e7c27972ff6e222cf
2019-01-23 19:22:04 -08:00
David Anderson
c98b1efd4c Merge "Expose IsFilePinned through FiemapWriter." 2019-01-24 03:14:55 +00:00
Justin Yun
2ab4e5a353 Merge "vndk: do not use prebuilt ld.config.<ver>.txt"
am: e72308c6b1

Change-Id: I913b42ed9a3ddffb380b1cce0d15ee352824a4c7
2019-01-23 18:56:00 -08:00
Treehugger Robot
e72308c6b1 Merge "vndk: do not use prebuilt ld.config.<ver>.txt" 2019-01-24 02:47:06 +00:00
Chris Wailes
9abd069f4d Merge "Added a new socket to Zygote init scripts."
am: a8bd23124c

Change-Id: Ibc67ef1c3010e5feba535654d248de9b60f1136b
2019-01-23 17:33:09 -08:00
Treehugger Robot
a8bd23124c Merge "Added a new socket to Zygote init scripts." 2019-01-24 01:11:58 +00:00
LongPing Wei
9f2e84e507 Do SetUpDmVerity only once for the same mount point
SetUpDmVerity won't return true twice for the same partition and it will
leads to failure when verify-boot is enabled on multi-fstab-lines.

Test: make
Change-Id: I5ce35e9c6b2d47fd0f599e36046e1ad2b0a35ffa
2019-01-23 23:30:13 +00:00
Mark Salyzyn
91ed3340d5 fs_mgr: overlayfs: test: test mount -o rw,remount command
WAI: Using mount -o rw,remount command can only work after the
overlays are setup.  After the second 'adb disable-verity' or
'adb remount -R' has been issued; the first only disables
verity and does not setup the backing storage.  If mount remount
command is issued after the first on an overlayfs system, it will
report a r/o filesystem.

Add a test that confirms that at least this supported behavior is
working, we do not test the corner case.

In the case of overlayfs, we have declared we will not support the
mount remount operation until then; we would need to modify toybox
to add logic that resides inside adb remount service.  toybox is
allowed to be adjusted to compile under Android and bionic, but it
is not supposed to have code that is specific to Android.

Fix last test to before this one to move us back into this state.
Fix the adb_sh command parser to handle properly quoting arguments
as it passes them to adb, since we will need it working for this
added test.

Report the product serial number of build description to aid triage.

Test: adb-remount-test.sh
Bug: 109821005
Bug: 122602260
Bug: 123079041
Change-Id: Ida051dbe2a918182db97f0f22f64b299e3c0a068
2019-01-23 14:41:49 -08:00
David Anderson
c7ca3b6760 Expose IsFilePinned through FiemapWriter.
This is needed for gsid to verify whether a file is pinned.

Bug: 122556707
Test: manual test
Change-Id: I662402294028597241ce11f86421f6ebb4a3cd6b
2019-01-23 13:54:19 -08:00
Chris Wailes
e45bda10e2 Added a new socket to Zygote init scripts.
This change adds new socket declarations to the init scripts for the
Zygote processes.  This socket is used for communication between the
System Server and the Blastula pool.

Bug: 68253328
Topic: zygote-prefork
Test: build image; flash device; launch apps
Change-Id: I5dbb87770b1a3100c6c122bb39ca854006bb0b0d
Merged-In: I5dbb87770b1a3100c6c122bb39ca854006bb0b0d
2019-01-23 13:37:27 -08:00
Henry Daitx
9ac57ceae7 Merge "Fix fastdeploy failure in Windows"
am: 09158b1d5a

Change-Id: I31b412fd193c2e5622eacad72c65e36c4a1b249a
2019-01-23 13:12:56 -08:00
Josh Gao
776c2ec08c adbd: compile for host.
Preparatory step for testing adb on GCE on non-linux hosts: instead of
pointing them at a device (emulated or otherwise), point them at adbd
running on a linux host instead.

Test: adbd & adb connect localhost:5555; adb -e wait-for-device shell
Change-Id: Ib22d51a4fc9e6e68f71bf1b3b9b2e1b0bd844760
2019-01-23 12:59:41 -08:00
Henry Daitx
09158b1d5a Merge "Fix fastdeploy failure in Windows" 2019-01-23 20:52:01 +00:00
Christopher Ferris
c9cbca8189 Merge "Fix flaky signal tests."
am: a5e0d695fa

Change-Id: I9aae6c550e66a3bdc5f3278a1639b1f4ca88e4ac
2019-01-23 10:08:02 -08:00
Christopher Ferris
4aec66e810 Fix memory leak in UnwinderFromPid object.
Actually make the destructor virtual so that objects in
UnwinderFromPid get freed.

Also, explicitly make the DexFiles and JitDebug destructors virtual.

Bug: 123099840

Test: Ran UnwindTest.local_from_pid thousands of times.
Change-Id: I8bf11c0eb3587fa82f5f14f4723ea5c91da0fd46
2019-01-23 09:49:28 -08:00
Christopher Ferris
a5e0d695fa Merge "Fix flaky signal tests." 2019-01-23 17:39:09 +00:00
Martin Stjernholm
00f2f79179 Merge changes from topic "runtime-ld-configs"
am: d35c4ccc40

Change-Id: Ia2c3f76a24009b1857840203a02a912614472911
2019-01-23 09:21:41 -08:00
Martin Stjernholm
d35c4ccc40 Merge changes from topic "runtime-ld-configs"
* changes:
  Make libdexfile_external.so accessible from binaries and libraries in /system.
  The runtime namespace needs to be visible since libopenjdk is loaded through dlopen().
2019-01-23 17:03:12 +00:00
Mark Salyzyn
6a47ef32db Merge changes I72aaf4d6,I420cb87c,Iab7c6cf7,Ic4388e20
am: 39624169e7

Change-Id: I7ffbe4123b13b1830c3e18727b21e1f21e131927
2019-01-23 08:55:19 -08:00
Treehugger Robot
39624169e7 Merge changes I72aaf4d6,I420cb87c,Iab7c6cf7,Ic4388e20
* changes:
  fs_mgr: overlay: support non-DAP A/B devices
  fs_mgr: overlayfs: test: check for existence of userspace fastboot
  fs_mgr: overlayfs: test: check for ext4 dedupe needing overlay
  fs_mgr: overlayfs: validate that kernel supports scratch filesystem
2019-01-23 16:39:22 +00:00
Mark Salyzyn
264b7dfa5e fs_mgr: overlay: support non-DAP A/B devices
Loosen some tests and borrow logic from retrofit Dynamic Android
Partitions (DAP) A/B devices.  In non-DAP A/B device case
/mnt/scratch is used, backed by the system other partition.

Tested on taimen with CONFIG_OVERLAY_FS added to its pre 4.6 kernel,
and BOARD_EXT4_SHARE_DUP_BLOCKS := true added to board config. Also
tested on a retrofit DAP A/B device and an untouched taimen.

Test: adb_remount_test.sh
Bug: 120448575
Change-Id: I72aaf4d68db1c3ac380aba425346ab6443cadad3
2019-01-23 16:38:33 +00:00