Commit graph

35597 commits

Author SHA1 Message Date
TreeHugger Robot
46691ee85c Merge "Remove nvram trusty implementation." into oc-mr1-dev 2017-08-15 23:46:44 +00:00
Elliott Hughes
2e93eda69c Don't include the build number in the adbd binary.
We want repeatable builds for minimal OTAs.

Bug: http://b/64634017
Bug: 64709603 (presubmit balking at the line above)
Test: repeated builds after `touch daemon/main.cpp` keep same md5sum
Change-Id: Iedeb44377ea45bbf20e2212760802198a57dc14a
2017-08-15 20:07:04 +00:00
Hung-ying Tyan
98a48d8e4b Remove nvram trusty implementation.
Bug: 64705490
Test: build pass
Change-Id: I32a1565ec935fff1c45540442134a37b55702752
2017-08-15 18:52:42 +08:00
TreeHugger Robot
f7ad622264 Merge "Mark libsync as LL-NDK" into oc-mr1-dev 2017-08-15 10:23:26 +00:00
TreeHugger Robot
acda9cba2e Merge "Add libft2.so to ll-ndk for rs namespace" into oc-mr1-dev 2017-08-15 10:16:17 +00:00
TreeHugger Robot
5f89f548fe Merge "Improvements to lmkd" into oc-mr1-dev 2017-08-15 00:47:44 +00:00
Josh Gao
68995633a9 debuggerd_handler: print pid and process name.
am: 30b69aab46

Change-Id: Iac44ddf6f6b4a1d4e4f3f8132280c437fdb7e43e
2017-08-14 18:06:26 +00:00
Jiyong Park
058e0919f6 Mark libsync as LL-NDK
libsync is used both by platform (e.g. libui.so) and by same-process
HALs (e.g. android.hardware.graphics.mapper@2.0-impl.so). Therefore it
is eligible for either VNDK-SP or LL-NDK. Among the two choices, LL-NDK
was selected because it is already an NDK and is just a thin wrapper
around a few kernel ioctls.

However, since libui (which is a vendor_available:true library) is using
more symbols that are not available to NDK clients, the extra symbols
are exposed as # vndk tag so that they are only available to VNDK
clients, but not to NDK clients.

Bug: 63866913
Test: BOARD_VNDK_VERSION=current m -j successful (2017 pixel)
Test: the built image is bootable
Change-Id: I60f883c049bd9b4562e6ce34d34ead47ba28af5f
2017-08-14 15:28:11 +09:00
Justin Yun
513f76394a Add libft2.so to ll-ndk for rs namespace
libft2.so is changed to ll-ndk that is available only for rs
namespace.

Bug: 64425518
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I991dc774ca9b92fb6e95a7656243a6a4ecdc0ab9
2017-08-14 12:18:29 +09:00
Josh Gao
30b69aab46 debuggerd_handler: print pid and process name.
Bug: http://b/64483618
Test: manual

(cherry picked from commit 81e6c0b613)

Change-Id: Icd957ccd21c2ce072f4cdf973b94de08fb0c5567
2017-08-11 22:01:36 -07:00
Robert Benea
caeaa655c1 Improvements to lmkd
- Don't show misleading messages, add the correct description for
  the reason of process killing
- Don't kill Launcher3 upgrade the score to perceptible (200)
- Limit the verbose logging

Test: tested on gobo
Bug: 64316273
Change-Id: Ic7c13853d939afe4f20cdaa5b488b6e1810f5ddf
2017-08-11 16:13:57 -07:00
Justin Yun
077dc8fca4 Mark libziparchive as VNDK in Android.bp
As a VNDK module, Android.bp must have 'vndk' tag as well as
'vendor_available: true'.

The 'vndk' tag for VNDK module is formated as below:
vndk: {
    enabled: true,
},

VNDK modules will be installed both in system/lib(64) as normal and
in system/lib(64)/vndk as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: Iec5d3496e91a99f3e6b0c816c67ad279672ff36a
2017-08-12 00:52:14 +09:00
TreeHugger Robot
28d4818037 Merge "Move libz vndk-sp from ll-ndk" into oc-mr1-dev 2017-08-11 15:13:42 +00:00
Hung-ying Tyan
5505eb783b Revert "Move trusty reference implementations to /vendor"
The CL is not complete and will cause build break when BOARD_VNDK_VERSION is set.

This reverts commit 7d81b4e081.

Change-Id: If9632fb7ee8147c39f1ad0860ddc3bed62ba89db
2017-08-11 08:02:21 +00:00
Justin Yun
dadd3a846f Move libz vndk-sp from ll-ndk
The ABI of libz is not as stable as it is for ll-ndk.

Bug: 37617391
Test: build and boot
Change-Id: I883bc6fda268e98cc7cdd5888264170c58688794
2017-08-10 17:39:30 +09:00
Hung-ying Tyan
7d81b4e081 Move trusty reference implementations to /vendor
Trusty implementations are provided by vendors. This patch moves
the AOSP reference implementations to the vendor partition.

Bug: 63085384
Test: build gordon_peak which adopts trusty as the TEE and confirm
      that libtrusty and gateway.trusty are moved to /vendor.
Test: build marlin which does not adopt trusty as the TEE and confirm
      that this patch has no effect on the build result.
Change-Id: I9a5440071386b929058207fdef560ed2d7223ba3
2017-08-10 10:48:17 +08:00
TreeHugger Robot
42a2f5c992 Merge "Permit /system/lib/vndk-sp/hw/ for 'sphal' namespace" into oc-mr1-dev 2017-08-09 05:08:30 +00:00
Jin Qian
9c54268dce storaged: call getNamesForUids to get uid names
Calls getNamesForUids when one of the two conditions are true.
1. entries for new uids are reported from io stats
2. previous getNamesForUids failed

Bug: 62805090
Merged-In: I120b81e1857b2aa0a90d0fb85c8d749e985df78e
Change-Id: I120b81e1857b2aa0a90d0fb85c8d749e985df78e
2017-08-08 20:59:03 +00:00
TreeHugger Robot
1146fa1379 Merge "Mark libmemtrack as VNDK in Android.bp" into oc-mr1-dev 2017-08-08 00:30:03 +00:00
Jin Qian
1a92eda0b0 fastboot: add mke2fs and e2fsdroid to build package
am: c2ca105575

Change-Id: I74925ef2808e16c0eb055eec4cbcdfd0ab31a27d
2017-08-04 16:18:43 +00:00
Jin Qian
a81b6e8d21 fastboot: call mke2fs to format ext4 filesystem on windows
am: 92064ef073

Change-Id: Ifbaca8b1afdb122a8188133e0eb01644c83bbdad
2017-08-04 16:18:25 +00:00
Jin Qian
6e9bbddc04 fastboot: call mke2fs tools to generate ext4 image
am: ffef31cef1  -s ours

Change-Id: Ib6c72d7e34adb80761fd67d4808bc29f2aaf4011
2017-08-04 16:18:06 +00:00
Jiyong Park
7d4cf3fd33 Permit /system/lib/vndk-sp/hw/ for 'sphal' namespace
android.hidl.memory@1.0-impl.so is a SP-HAL located in
/system/lib/vndk-sp/hw. This can't be moved to /vendor/lib since it is a
framework HAL.

Bug: 62930720
Test: 2017 pixel builds and boots with BOARD_VNDK_VERSION on
Change-Id: I9c456983ef68120c5e8c629efc6dd66a26220ecb
2017-08-04 16:38:39 +09:00
Robert Benea
85d9063ff7 Merge "Make lmkd memory pressure levels configurable." into oc-mr1-dev 2017-08-04 03:48:03 +00:00
Yifan Hong
f004d8de4d Merge "Move android_filesystem_config.h => fs_config.h" into oc-mr1-dev 2017-08-03 22:53:07 +00:00
Yifan Hong
b3ecb59163 Merge "Remove private headers from libcutils.vendor" into oc-mr1-dev 2017-08-03 22:53:07 +00:00
Jin Qian
c2ca105575 fastboot: add mke2fs and e2fsdroid to build package
Bug: 23686092
Bug: 63849632
Change-Id: Iff0d92b7174597d43ee646847888aedc2080052a
(cherry picked from commit 6ce78321a2)
2017-08-03 14:50:17 -07:00
Jin Qian
92064ef073 fastboot: call mke2fs to format ext4 filesystem on windows
Bug: 35219933
Change-Id: I0cc8c165176e8dc9cbe4b6a52679937bc872e2d0
(cherry picked from commit 29fc859a6d)
2017-08-03 14:40:43 -07:00
Jin Qian
ffef31cef1 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-08-03 14:39:12 -07:00
TreeHugger Robot
5e404f3e87 Merge "storaged: fix excessive accounting when io usage has negative delta" into oc-mr1-dev 2017-08-03 19:49:01 +00:00
Jin Qian
ccae2b5779 storaged: fix excessive accounting when io usage has negative delta
When current io bytes are smaller than previous bytes, add 0 to delta
instead of adding current io bytes.

Bug: 64317562
Merged-In: If0c9814892ad61b790baa6395649af10b11d5b7c
Change-Id: I1ffd7ac33649ab3b8405c83b1328fa9bf49702c0
2017-08-03 17:28:52 +00:00
Yifan Hong
aadcb26adb Move android_filesystem_config.h => fs_config.h
The non AID_ things in android_filesystem_config.h are moved
to fs_config.h. For libcutils.vendor and libcutils_headers.vendor,
fs_config.h is not exported.

An empty system/core/include/private/fs_config.h is placed to
appease the dependency from certain modules (logd, etc.)
that includes system/core/include/private/android_filesystem_config.h
directly.

Test: m -j
Test: BOARD_VNDK_VERSION=current m -j
Bug: 63135587
Change-Id: I95dfb874a426941022b100c0ca26a0576b0f4aa3
Merged-In: I95dfb874a426941022b100c0ca26a0576b0f4aa3
2017-08-03 17:20:27 +00:00
TreeHugger Robot
041abda3df Merge "Mark the modules as VNDK in Android.bp" into oc-mr1-dev 2017-08-03 09:06:27 +00:00
TreeHugger Robot
68e0bef34c Merge "Mark an SP-NDK, libsync.so as VNDK libs." into oc-mr1-dev 2017-08-03 08:41:06 +00:00
Justin Yun
7aeb5bb86c Mark libmemtrack as VNDK in Android.bp
As a VNDK module, Android.bp must have 'vndk' tag as well as
'vendor_available: true'.

The 'vndk' tag for VNDK module is formated as below:
vndk: {
    enabled: true,
},

VNDK modules will be installed both in system/lib(64) as normal and
in system/lib(64)/vndk as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I4b9e560ca6d4751889a7b14f205e678b68c20008
2017-08-03 15:49:19 +09:00
Justin Yun
9b0ed72942 Mark the modules as VNDK in Android.bp
As a VNDK module, Android.bp must have 'vndk' tag as well as
'vendor_available: true'.

The 'vndk' tag for VNDK module is formated as below:
vndk: {
        enabled: true,
},
    
VNDK modules will be installed both in system/lib(64) as normal and
in system/lib(64)/vndk as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: Icecb22ed2ed0f58c3168605d4cf64815e2dda750
2017-08-03 06:43:23 +00:00
TreeHugger Robot
c5ebe0f5a0 Merge "libvndksupport: Change log level and message." into oc-mr1-dev 2017-08-03 05:08:54 +00:00
TreeHugger Robot
58f38017f7 Merge "Mark the modules as VNDK-SP in Android.bp" into oc-mr1-dev 2017-08-03 01:01:06 +00:00
Yifan Hong
6c21096251 Remove private headers from libcutils.vendor
Bug: 63135587
Test: m -j
Test: BOARD_VNDK_VERSION=current m -j
Test: mma -j
Test: BOARD_VNDK_VERSION=current mma -j

Change-Id: I9eecf23c4c311bd8336a5bfaaeb2afb3b51c6513
Merged-In: I9eecf23c4c311bd8336a5bfaaeb2afb3b51c6513
2017-08-02 16:43:50 -07:00
Robert Benea
58891d59b7 Make lmkd memory pressure levels configurable.
By doing so different platforms can customize them accordingly.
For instance a low mem, 512MB device can do
ro.lmk.medium=400, while a device with more memory can keep
the default(800).

Test: tested on gobo.
Bug: 64316084
Change-Id: Ifc4f3853bc06f30488adb25883ccd9aaf683ba9b
2017-08-02 23:42:48 +00:00
TreeHugger Robot
3bb2dfd252 Merge "sync: store the num_fences from first SYNC_IOC_FILE_INFO" into oc-mr1-dev 2017-08-02 15:41:55 +00:00
Justin Yun
9560088743 libvndksupport: Change log level and message.
If no 'sphal' namespace exist, the sphal library may be found in
current namespace.
Change the log level and message to note this.

Bug: 64162324
Test: Check log message for vndksupport tag.
Change-Id: I5ed6ba1e48f99e7d11d80a465177ac9f3a7fbd97
2017-08-02 14:21:14 +09:00
Jin Qian
216ed8f61a fastboot: call mke2fs to format ext4 filesystem on windows
Bug: 35219933
Change-Id: I0cc8c165176e8dc9cbe4b6a52679937bc872e2d0
(cherry picked from commit 29fc859a6d)
2017-08-01 17:47:57 -07:00
Jin Qian
a86141aa81 fastboot: enable uninit_bg for ext4
This speeds up mke2fs as well as e2fsck.

Bug: 23686092
Bug: 64032335
Change-Id: I9f2d4c15e431647bb845d50a2361b2a9a091fba6
(cherry picked from commit 99e3964e0d)
2017-08-01 17:47:51 -07:00
Saurabh Shah
cad5925fc9 sync: store the num_fences from first SYNC_IOC_FILE_INFO
Fixes a bug with the signal time of devices using the
modern sync file interface. The bug only affects kernels running
an Android kernel 4.9 and later.

b/63395253

Test: tests/sync_test.cpp

Change-Id: I6fb00bcb8e16a3268c357153edd8e35a44546caa
2017-08-01 21:05:33 +00:00
Jean-Luc Brouillet
24d43899cd Merge "Make the Neural Networks library loadable by apps." into oc-mr1-dev 2017-08-01 02:26:10 +00:00
Justin Yun
aeb68e86e4 Mark the modules as VNDK-SP in Android.bp
As a VNDK-SP module, Android.bp must have 'vndk' tag as well as
'vendor_available: true'.

The 'vndk' tag for VNDK-SP formated as follows:
vndk: {
    enabled: true,
    support_system_process: true,
},

VNDK-SP modules will be installed both in system/lib(64) as normal
and in system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I51fe0859f63ad58b7b91909e7d7d4206443228cd
2017-07-31 23:37:32 +00:00
Yu Ning
6a38aa83b6 Allow the use of a custom Android DT directory
On platforms that use ACPI instead of Device Tree (DT), such as
Ranchu x86/x86_64, /proc/device-tree/firmware/android/ does not
exist. As a result, Android O is unable to mount /system, etc.
at the first stage of init:

 init: First stage mount skipped (missing/incompatible fstab in
 device tree)

Those platforms may create another directory that mimics the layout
of the standard DT directory in procfs, and store early mount
configuration there. E.g., Ranchu x86/x86_64 creates one in sysfs
using information encoded in the ACPI tables:

 https://android-review.googlesource.com/442472
 https://android-review.googlesource.com/443432
 https://android-review.googlesource.com/442393
 https://android-review.googlesource.com/442395

Therefore, instead of hardcoding the Android DT path, load it from
the kernel command line using a new Android-specific property key
("androidboot.android_dt_dir"). If no such property exists, fall
back to the standard procfs path (so no change is needed for DT-
aware platforms).

Note that init/ and fs_mgr/ each have their own copy of the Android
DT path, because they do not share any global state. A future CL
should remove the duplication by refactoring.

With this CL as well as the above ones, the said warning is gone,
but early mount fails. That is a separate bug, though, and will be
addressed by another CL.

Test: Boot patched sdk_phone_x86-userdebug system image with patched
      Goldfish 3.18 x86 kernel in patched Android Emulator, verify
      the "init: First stage mount skipped" warning no longer shows
      in dmesg.

Signed-off-by: Yu Ning <yu.ning@intel.com>

(cherry picked from commit c08d2cb0fb7ce470e128c7571553aa12ae9b57a4)

Change-Id: Ia8d5f68e044fde0ecf5c7b14e40f040ff42bc35d
2017-07-31 15:27:09 -07:00
James Hawkins
f415d1253c bootstat: Log even more boot reasons.
Bug: 27555866
Test: None
Change-Id: I8ab6597a323f5973d8b1c22c2c7422ef0c2efcc3
(cherry picked from commit 8d7f63da26)
2017-07-28 14:50:16 -07:00
TreeHugger Robot
8e5c465ee7 Merge changes I60250d10,I08effe32 into oc-mr1-dev
* changes:
  init: fix type of 2nd argument passed to prctl
  init: only use signed-integer-overflow sanitizer
2017-07-28 00:47:54 +00:00