Justin Yun
30bc0971fb
Merge "Mark the modules as VNDK in Android.bp" am: 5d1e740e7f am: 8c03107614
...
am: 8ca8cecdbc
2017-09-15 16:36:28 +00:00
Justin Yun
8ca8cecdbc
Merge "Mark the modules as VNDK in Android.bp" am: 5d1e740e7f
...
am: 8c03107614
2017-09-15 16:33:25 +00:00
Justin Yun
8c03107614
Merge "Mark the modules as VNDK in Android.bp"
...
am: 5d1e740e7f
2017-09-15 16:31:01 +00:00
Treehugger Robot
5d1e740e7f
Merge "Mark the modules as VNDK in Android.bp"
2017-09-15 16:23:30 +00:00
Jae Shin
a3fc9b3985
resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master am: 0ed84e3e91
...
am: d7b3810816
2017-09-15 15:36:32 +00:00
Jae Shin
d7b3810816
resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master
...
am: 0ed84e3e91
2017-09-15 15:34:02 +00:00
Jae Shin
0ed84e3e91
resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia163118a25cfc2e079803c230d69e55357acd3fa
2017-09-15 16:50:34 +09:00
Jae Shin
0dd4b6aa39
Merge "gatekeeperd: use std::unique_ptr"
2017-09-15 07:00:07 +00:00
Jae Shin
d7b005ee23
Merge changes I60f883c0,Ie5955865 am: 8c3e940324 am: 3eaaa508e9
...
am: d558c377f6
2017-09-15 03:35:24 +00:00
Robert Benea
4d4c39ca3b
Merge "Downgrade memory pressure events" into oc-mr1-dev
...
am: 767eb64f36
2017-09-15 02:59:20 +00:00
Jae Shin
d558c377f6
Merge changes I60f883c0,Ie5955865 am: 8c3e940324
...
am: 3eaaa508e9
2017-09-15 02:07:50 +00:00
TreeHugger Robot
767eb64f36
Merge "Downgrade memory pressure events" into oc-mr1-dev
2017-09-15 01:42:33 +00:00
Jae Shin
3eaaa508e9
Merge changes I60f883c0,Ie5955865
...
am: 8c3e940324
2017-09-15 01:41:14 +00:00
Justin Yun
919cc55a7e
gatekeeperd: use std::unique_ptr
...
std::unique_ptr is available in this scope. Substitute the UniquePtr to
std::unique_ptr.
Bug: 63686260
Test: build and boot
Merged-In: Ib8ea3fb5c49c0e92d962f65f1139b073168f8698
Change-Id: Ib8ea3fb5c49c0e92d962f65f1139b073168f8698
(cherry picked from commit 68b0ec6487
2017-09-15 01:12:43 +00:00
Jae Shin
8c3e940324
Merge changes I60f883c0,Ie5955865
...
* changes:
Mark libsync as LL-NDK
Fix NDK libsync to match ndk/sync.h
2017-09-15 01:02:53 +00:00
Jiyong Park
b87f884b99
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
Merged-In: I60f883c049bd9b4562e6ce34d34ead47ba28af5f
Change-Id: I60f883c049bd9b4562e6ce34d34ead47ba28af5f
(cherry picked from commit 058e0919f6
2017-09-15 00:33:52 +00:00
Jesse Hall
b5ec6a032c
Fix NDK libsync to match ndk/sync.h
...
The header names were changed during review, but the library map file
wasn't updated.
Bug: 62229958
Test: CtsGraphicsTestCases:android.graphics.cts.SyncTest
Merged-In: Ie5955865667b35067f1ee209933f159f170419cd
Change-Id: Ie5955865667b35067f1ee209933f159f170419cd
(cherry picked from commit 59d9ee5d02
2017-09-15 00:32:27 +00:00
Robert Benea
6e8e710675
Downgrade memory pressure events
...
If the system has enough memory the pressure events are ignored or
downgraded from critical to medium.
Bug: 65642829
Test: tested on gobo
Change-Id: I44e66d2e35508aceee5c1719313db217b80d582e
2017-09-14 13:47:40 -07:00
Josh Gao
2b97b03ba1
Merge changes I0ed00441,I12d46493,Ib484f701 am: 0a01830612 am: 1425641300
...
am: da20ef4684
2017-09-14 20:42:30 +00:00
Josh Gao
da20ef4684
Merge changes I0ed00441,I12d46493,Ib484f701 am: 0a01830612
...
am: 1425641300
2017-09-14 20:37:14 +00:00
Josh Gao
1425641300
Merge changes I0ed00441,I12d46493,Ib484f701
...
am: 0a01830612
2017-09-14 20:35:31 +00:00
Josh Gao
0a01830612
Merge changes I0ed00441,I12d46493,Ib484f701
...
* changes:
Revert "adb: fix deadlock between transport_unref and usb_close."
adb: add lock to remove_socket.
adb: reformat comments.
2017-09-14 20:04:42 +00:00
Elliott Hughes
0fa1eff6bc
Merge "Update shell and utilities docs for O." am: 1ca9852366 am: 80c5a9bb77
...
am: 07f2b44588
2017-09-14 19:34:37 +00:00
Elliott Hughes
07f2b44588
Merge "Update shell and utilities docs for O." am: 1ca9852366
...
am: 80c5a9bb77
2017-09-14 19:31:37 +00:00
Elliott Hughes
80c5a9bb77
Merge "Update shell and utilities docs for O."
...
am: 1ca9852366
2017-09-14 19:29:08 +00:00
Treehugger Robot
1ca9852366
Merge "Update shell and utilities docs for O."
2017-09-14 19:22:06 +00:00
Richard Uhler
f5c8cd2ff9
Merge "Revert "Add derive_gid flag for mounting sdcardfs"" into oc-mr1-dev
...
am: c397915d72
2017-09-14 15:40:58 +00:00
Josh Gao
dcb92234e4
Merge "debuggerd_fallback: print maps." into oc-mr1-dev
...
am: 4fda598b08
2017-09-14 15:40:30 +00:00
Daniel Rosenberg
2d7de53a73
Merge "Add derive_gid flag for mounting sdcardfs" into oc-mr1-dev
...
am: 47c5929bb5
2017-09-14 15:39:46 +00:00
Richard Uhler
c397915d72
Merge "Revert "Add derive_gid flag for mounting sdcardfs"" into oc-mr1-dev
2017-09-14 14:55:32 +00:00
Jiyong Park
25a03a23a8
Merge changes from topic "vndk_jni" into oc-mr1-dev
...
am: 6f7d928940
2017-09-14 14:52:51 +00:00
Jiyong Park
6eaa30765e
add llndk|vndksp.libraries.txt to vndk_package
...
am: 26335f89b1
2017-09-14 14:52:40 +00:00
Tom Cherry
988220c73c
Merge "init: fix variable scope issue with ExpandArgs()" into oc-mr1-dev
...
am: ece234f9ac
2017-09-14 14:52:03 +00:00
Richard Uhler
28dbcaa23b
Revert "Add derive_gid flag for mounting sdcardfs"
...
This reverts commit 8ca02bbeb5
2017-09-14 14:51:36 +00:00
Tom Cherry
e171070d59
init: fix signal handling and LOG(FATAL) in child processes
...
am: 43a7da2c40
2017-09-14 14:10:43 +00:00
Narayan Kamath
fa6836f560
Merge "tombstoned: Fix calls to evconnlistener_new." am: e997ba9d22 am: 17785d2030
...
am: ad458ebcd6
2017-09-14 08:42:24 +00:00
Narayan Kamath
ad458ebcd6
Merge "tombstoned: Fix calls to evconnlistener_new." am: e997ba9d22
...
am: 17785d2030
2017-09-14 08:39:34 +00:00
Narayan Kamath
17785d2030
Merge "tombstoned: Fix calls to evconnlistener_new."
...
am: e997ba9d22
2017-09-14 08:36:25 +00:00
Justin Yun
6a7e882316
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
Merged-In: Icecb22ed2ed0f58c3168605d4cf64815e2dda750
Change-Id: Icecb22ed2ed0f58c3168605d4cf64815e2dda750
(cherry picked from commit 9b0ed72942
2017-09-14 08:35:16 +00:00
Narayan Kamath
e997ba9d22
Merge "tombstoned: Fix calls to evconnlistener_new."
2017-09-14 08:33:49 +00:00
Josh Gao
f034660179
Merge "debuggerd_fallback: print maps." am: 26123d7ec0 am: 4abd463d20
...
am: 1987fb6f7c
2017-09-14 06:12:31 +00:00
Justin Yun
705f601b84
Merge "Mark libmemtrack as VNDK in Android.bp" am: 0978f02468 am: 5dd33fe086
...
am: 347685b77d
2017-09-14 06:12:03 +00:00
James Hawkins
7e992d8b52
bootstat: Log the ro.boot.bootreason property through the new platform_reason Tron field.
...
am: ea2e67526d
2017-09-14 06:06:22 +00:00
Josh Gao
4fda598b08
Merge "debuggerd_fallback: print maps." into oc-mr1-dev
2017-09-14 06:02:48 +00:00
Josh Gao
1987fb6f7c
Merge "debuggerd_fallback: print maps." am: 26123d7ec0
...
am: 4abd463d20
2017-09-14 05:59:13 +00:00
Josh Gao
4abd463d20
Merge "debuggerd_fallback: print maps."
...
am: 26123d7ec0
2017-09-14 05:56:46 +00:00
Justin Yun
347685b77d
Merge "Mark libmemtrack as VNDK in Android.bp" am: 0978f02468
...
am: 5dd33fe086
2017-09-14 05:54:15 +00:00
Treehugger Robot
26123d7ec0
Merge "debuggerd_fallback: print maps."
2017-09-14 05:49:24 +00:00
Justin Yun
5dd33fe086
Merge "Mark libmemtrack as VNDK in Android.bp"
...
am: 0978f02468
2017-09-14 05:36:44 +00:00
Treehugger Robot
0978f02468
Merge "Mark libmemtrack as VNDK in Android.bp"
2017-09-14 05:26:14 +00:00
