Commit graph

45150 commits

Author SHA1 Message Date
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
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
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
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
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
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
Hridya Valsaraju
ad518bd4d7 Modify mkbootimg.py to support boot image header version 2
Boot image with header version 2 supports inclusion of
DTB image within the boot image.

Bug: 111136242
Test: unpack_bootimg.py is able to extract DTB added by
mkbootimg.py

Change-Id: Ie6ae2507aa0c1960c73077d618aacafb83ae8459
2019-01-23 08:35:46 -08:00
Martin Stjernholm
c02464ced9 Make libdexfile_external.so accessible from binaries and libraries in /system.
There are dependencies on libdexfile_external from some central libraries
that are widely used (b/123186083).

One example is vendor/bin/hw/android.hardware.media.omx@1.0-service, which
requries the link from "system" to "runtime" in the [vendor] section.

The direct dependants are libunwindstack and simpleperf, so it's enough to
link from namespaces containing /system/{lib,lib64,bin}.

Test: Flash and boot
Test: Flash and boot with Runtime APEX enabled (http://r.android.com/q/topic:art-move-libs-to-runtime-apex)
Bug: 123186083
Bug: 113373927
Change-Id: I081aa7392c875202acdaf1185c2ff28e17ac7e76
2019-01-23 15:45:59 +00:00
Neil Fuller
f40156d69c Add a symlink for the ICU .dat file
The ICU .dat file was moved into the runtime APEX file
in commit b6d855f081c232309961f31c7c7c8a76abf79c3c.
There are some apps that know the old location and its
absence causes them to fail.

This change adds a symlink from the old directory to
the new directory. The ICU .dat file changes its name
with every ICU major release so this is simpler than
linking the file itself.

Bug: 119293618
Bug: 120853401
Bug: 122985829
Test: make droid / inspect output
Test: Confirm broken app works on an internal master build
Change-Id: I452dcb5e52975011c9ebd3db2caa621bbefedaf3
2019-01-23 12:03:48 +00:00
Henry Daitx
f788f67c23 Fix fastdeploy failure in Windows
adb --fastdeploy creates a TemporaryFile to which the stdout for a shell
command is redirected. This happens while the file is still open (the
TemporaryFile object holds the file handle). In Linux this works, but
Windows blocks the operation with an error of "The process cannot access
the file because it is being used by another process".

This change closes the file before the shell tries to write to it.

Test: mm -j 72
Test: adb install --fastdeploy --force-agent --local-agent /mnt/raid/boat-attack-apk/boat-attack-swappy.apk

Bug: 122592986
Change-Id: Iaaaf62cda43e4714d7f979e6a690549b383a7b82
2019-01-23 11:00:45 +00:00
Justin Yun
ebe4e2404b vndk: do not use prebuilt ld.config.<ver>.txt
Regardless of VNDK version, use template ld.config.txt instead of
using prebuilt ld.config.txt.

Bug: 74658756
Bug: 123209911
Test: PRODUCT_EXTRA_VNDK_VERSIONS=27 m -j vndk_snapshot_package
Change-Id: I0eb527b71e56c555079c524542508a093bf53111
2019-01-23 19:22:29 +09:00
Nicolas Geoffray
31e937429c Merge "Conscrypt should only link against bionic."
am: 1cab2c6bec

Change-Id: I8ee133fed8bbf6f87c90680da91ffa018c49fcba
2019-01-23 01:18:47 -08:00
Nicolas Geoffray
1cab2c6bec Merge "Conscrypt should only link against bionic." 2019-01-23 09:08:42 +00:00
Sandeep Patil
040367712d Merge "meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class."
am: 62b80fa3ad

Change-Id: Iefc36a462b0315cdd17b2a9cfd01bb783223d786
2019-01-22 21:23:56 -08:00
Sandeep Patil
62b80fa3ad Merge "meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class." 2019-01-23 05:17:16 +00:00
Josh Gao
d2f6058806 Merge "adb: win32: improve console output on Windows 10"
am: 54d1e31c63

Change-Id: Ifd13cba3d4c2735670fcbb998743fd58edcc4497
2019-01-22 20:09:55 -08:00
Josh Gao
6a3c02be54 Merge "adb: win32: LinePrinter Unicode support"
am: 89a6fdc4b3

Change-Id: I58892c14ee45fc00f1f8573349f4225df6e8b2cc
2019-01-22 20:06:23 -08:00
Josh Gao
54d1e31c63 Merge "adb: win32: improve console output on Windows 10" 2019-01-23 03:59:27 +00:00
Josh Gao
89a6fdc4b3 Merge "adb: win32: LinePrinter Unicode support" 2019-01-23 03:47:21 +00:00
Mark Salyzyn
7859d9c581 Merge "fs_mgr: overlayfs: erofs is in staging"
am: 932e77137c

Change-Id: If57b0b977b6e25c1eb846b848fff167999bcb543
2019-01-22 17:09:40 -08:00
Treehugger Robot
932e77137c Merge "fs_mgr: overlayfs: erofs is in staging" 2019-01-23 00:36:17 +00:00
Mark Salyzyn
52490faabe fs_mgr: overlayfs: test: check for existence of userspace fastboot
If there is no userspace fastboot, then overlayfs has a corner case
bug where overlay content is not wiped when the partition is flashed.
We will report a warning instead.

This is done to reduce the flakiness of the test results as we do not
intend to fix this specific corner case in the short term.  We would
require to record a sha representing the flash image, and the risks
were evaluated as too high of an impact on libavb to add interfaces
to expose the signatures, especially at first stage mount time.  All
new devices must support Dynamic Android Partitions (DAP), which
means they all have support for userspace fastboot, it will be
considered a misconfiguration and thus the position is we will not
fix this issue and only use this test adjustment to deal with legacy
products.  If a legacy non-DAP product wishes to close the issue
today, they must supply a user space fastboot.

Test: adb-remount-test.sh
Bug: 109821005
Bug: 123079041
Change-Id: I420cb87c19e3e184a974dfc373fb17c097d4858f
2019-01-22 15:28:38 -08:00
Mark Salyzyn
3fe0a8164d fs_mgr: overlayfs: test: check for ext4 dedupe needing overlay
Check if any system partition looks like it has ext dedupe or
rather shared_blocks feature enabled, if so then we expect
overlayfs to kick in.  We do this to deal with any flakiness
in the test when right-sizing is not applied to the platform.

Minor: older devices mounted persist to /persist.

Test: adb-remount-test.sh
Bug: 109821005
Bug: 123079041
Change-Id: Iab7c6cf7f24f2c446aeb149e3f65d6793a42c6ea
2019-01-22 15:28:23 -08:00