Andrew Hsieh
16d20205e1
Merge "gatekeeperd: use std::unique_ptr" into oc-mr1-dev
...
am: 202fedd1fe
2017-08-18 19:18:46 +00:00
Andrew Hsieh
202fedd1fe
Merge "gatekeeperd: use std::unique_ptr" into oc-mr1-dev
2017-08-18 19:12:16 +00:00
Justin Yun
c2b07dbec4
Add vndk tag for libunwindstack which must be a vndk-sp
...
As a VNDK-SP module, Android.bp must have 'vndk' tag as well as
'vendor_available: true'.
The 'vndk' tag for VNDK-SP module is formated as below:
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 with BOARD_VNDK_VERSION=current
Change-Id: Idb4757988d1799ffcd3341343fcc4dac34bf7ef3
(cherry picked from commit 14d540a156
2017-08-18 16:30:38 +00:00
Tom Cherry
0be5ecf56a
Merge "init: replace panic() with LOG(FATAL)" am: 57a89f3ba0 am: ce2325895f am: 0ae159a920
...
am: 18966c55e9
2017-08-18 16:15:58 +00:00
Tom Cherry
18966c55e9
Merge "init: replace panic() with LOG(FATAL)" am: 57a89f3ba0 am: ce2325895f
...
am: 0ae159a920
2017-08-18 16:09:57 +00:00
Tom Cherry
0ae159a920
Merge "init: replace panic() with LOG(FATAL)" am: 57a89f3ba0
...
am: ce2325895f
2017-08-18 16:03:57 +00:00
Tom Cherry
ce2325895f
Merge "init: replace panic() with LOG(FATAL)"
...
am: 57a89f3ba0
2017-08-18 15:58:26 +00:00
Tom Cherry
57a89f3ba0
Merge "init: replace panic() with LOG(FATAL)"
2017-08-18 15:49:46 +00:00
Huihong Luo
f45940ac71
Merge "Fix bug #37284906 , adb shell crashes on windows with invalid options. For example, "adb.exe shell -list" crashes without this fix. Test: adb.exe shell -list-packages" am: e275043d38 am: 4be54a4622 am: 94574c4f00
...
am: 2f19bbe3e9
2017-08-18 14:59:52 +00:00
Huihong Luo
2f19bbe3e9
Merge "Fix bug #37284906 , adb shell crashes on windows with invalid options. For example, "adb.exe shell -list" crashes without this fix. Test: adb.exe shell -list-packages" am: e275043d38 am: 4be54a4622
...
am: 94574c4f00
2017-08-18 14:53:51 +00:00
Huihong Luo
94574c4f00
Merge "Fix bug #37284906 , adb shell crashes on windows with invalid options. For example, "adb.exe shell -list" crashes without this fix. Test: adb.exe shell -list-packages" am: e275043d38
...
am: 4be54a4622
2017-08-18 14:48:21 +00:00
Huihong Luo
4be54a4622
Merge "Fix bug #37284906 , adb shell crashes on windows with invalid options. For example, "adb.exe shell -list" crashes without this fix. Test: adb.exe shell -list-packages"
...
am: e275043d38
2017-08-18 14:42:21 +00:00
Huihong Luo
e275043d38
Merge "Fix bug #37284906 , adb shell crashes on windows with invalid options. For example, "adb.exe shell -list" crashes without this fix. Test: adb.exe shell -list-packages"
2017-08-18 14:35:52 +00:00
Justin Yun
2e30e1585f
Make libvndksupport look for default namespace as well.
...
am: 2c9140f54e
2017-08-18 06:29:45 +00:00
Justin Yun
2c9140f54e
Make libvndksupport look for default namespace as well.
...
In vendor process, libvndksupport must look for "default" namespace,
instead of "sphal" namespace to open hal libraries.
Bug: 63411330
Test: Boot the device.
Change-Id: I26208b6f47708f83e0679fd72ca7471ade84fff9
2017-08-18 15:20:20 +09:00
Bowgo Tsai
2a64967b7a
Merge "Move adbd from root to system" into oc-mr1-dev
...
am: 0bb4cb6fa2
2017-08-18 06:06:49 +00:00
Huihong Luo
af39885c9f
Fix bug #37284906 , adb shell crashes on windows with invalid options.
...
For example, "adb.exe shell -list" crashes without this fix.
Test: adb.exe shell -list-packages
Change-Id: I96be44128ff3ecab7804b70074cbde630b3fc3d1
2017-08-17 22:26:46 -07:00
TreeHugger Robot
0bb4cb6fa2
Merge "Move adbd from root to system" into oc-mr1-dev
2017-08-18 03:52:36 +00:00
Jiyong Park
b62e979d72
Merge "Make the rs namespace visible" into oc-mr1-dev
...
am: f34814e06c
2017-08-18 03:15:40 +00:00
TreeHugger Robot
f34814e06c
Merge "Make the rs namespace visible" into oc-mr1-dev
2017-08-18 03:07:50 +00:00
Tom Cherry
2e9773a30a
Merge "init: fix copy/paste mistake" am: f85404521e am: ad42b33eaa am: c3398d9e87
...
am: 3cbfff1615
2017-08-18 02:36:28 +00:00
Tom Cherry
3cbfff1615
Merge "init: fix copy/paste mistake" am: f85404521e am: ad42b33eaa
...
am: c3398d9e87
2017-08-18 02:20:22 +00:00
Tom Cherry
c3398d9e87
Merge "init: fix copy/paste mistake" am: f85404521e
...
am: ad42b33eaa
2017-08-18 02:07:25 +00:00
Tom Cherry
ad42b33eaa
Merge "init: fix copy/paste mistake"
...
am: f85404521e
2017-08-18 01:55:43 +00:00
David Zeuthen
ac50df6884
Merge "fastboot: Add --disable-verity and --disable-verification options." into oc-mr1-dev
...
am: d14e75d43e
2017-08-18 01:50:31 +00:00
Treehugger Robot
f85404521e
Merge "init: fix copy/paste mistake"
2017-08-18 01:49:40 +00:00
TreeHugger Robot
d14e75d43e
Merge "fastboot: Add --disable-verity and --disable-verification options." into oc-mr1-dev
2017-08-18 01:34:50 +00:00
Tom Cherry
d8db7ab80d
init: replace panic() with LOG(FATAL)
...
Test: boot bullhead
Test: Introduce LOG(FATAL) at various points of init and ensure that
it reboots to the bootloader successfully
Test: Introduce LOG(FATAL) during DoReboot() and ensure that it reboots
instead of recursing infinitely
Test: Ensure that fatal signals reboot to bootloader
Change-Id: I409005b6fab379df2d635e3e33d2df48a1a97df3
2017-08-17 18:16:51 -07:00
Tom Cherry
94f3bcdbc1
init: fix copy/paste mistake
...
Test: boot bullhead
Change-Id: I0fedb48a9684e21a27a1d260b84cb49a1038ce3f
2017-08-17 16:52:10 -07:00
Justin Yun
68b0ec6487
gatekeeperd: use std::unique_ptr
...
std::unique_ptr is available in this scope. Substitue the UniquePtr to
std::unique_ptr.
Bug: 63686260
Test: build and boot
Change-Id: Ib8ea3fb5c49c0e92d962f65f1139b073168f8698
2017-08-17 14:58:23 +09:00
Wei Wang
9f37a996ce
Merge "Skip unnecessary sleep during shutdown" am: e3e4ec7c97 am: 57f94aa4bc am: 0660919ccf
...
am: 7bba2bf2d9
2017-08-17 02:08:34 +00:00
Wei Wang
7bba2bf2d9
Merge "Skip unnecessary sleep during shutdown" am: e3e4ec7c97 am: 57f94aa4bc
...
am: 0660919ccf
2017-08-17 02:03:05 +00:00
Wei Wang
0660919ccf
Merge "Skip unnecessary sleep during shutdown" am: e3e4ec7c97
...
am: 57f94aa4bc
2017-08-17 01:56:17 +00:00
Wei Wang
57f94aa4bc
Merge "Skip unnecessary sleep during shutdown"
...
am: e3e4ec7c97
2017-08-17 01:54:18 +00:00
Wei Wang
e3e4ec7c97
Merge "Skip unnecessary sleep during shutdown"
2017-08-17 01:46:17 +00:00
David Zeuthen
34c001bff2
fastboot: Add --disable-verity and --disable-verification options.
...
This can be used to disable verity and/or verification when flashing a
build to a device. It works with both 'fastboot flashall' and
'fastboot flash vbmeta /path/to/vbmeta.img'.
Bug: 62903976
Test: Manually tested.
Merged-In: Iad22d42a9dd5befd70ecd0224803721a10a28d90
Change-Id: Iad22d42a9dd5befd70ecd0224803721a10a28d90
(cherry picked from commit b6ea435a20
2017-08-17 09:28:53 +08:00
Wei Wang
8c00e42f20
Skip unnecessary sleep during shutdown
...
Skip sleep if timeout is zero
Skip sleep if first pass umount succeed
Bug: 64768138
Test: reboot
Change-Id: I5ef731611320ade51974b414f7e47520ce36b287
2017-08-16 15:41:12 -07:00
Ting-Yuan Huang
119f0f8d9c
Merge "Fix a potential memory leak" am: f583ff660e am: 6677429bff am: 6deffe3c3b
...
am: 78a298ce24
2017-08-16 18:00:15 +00:00
Ting-Yuan Huang
78a298ce24
Merge "Fix a potential memory leak" am: f583ff660e am: 6677429bff
...
am: 6deffe3c3b
2017-08-16 17:34:11 +00:00
Ting-Yuan Huang
6deffe3c3b
Merge "Fix a potential memory leak" am: f583ff660e
...
am: 6677429bff
2017-08-16 17:18:44 +00:00
Ting-Yuan Huang
6677429bff
Merge "Fix a potential memory leak"
...
am: f583ff660e
2017-08-16 17:06:44 +00:00
Treehugger Robot
f583ff660e
Merge "Fix a potential memory leak"
2017-08-16 16:55:54 +00:00
Jiyong Park
421a5e46b7
Make the rs namespace visible
...
This allows us to dlopen libRS_internal.so directly from the rs
namespace, not from the sphal namespace.
Bug: 64747884
Test: VtsHalRenderscriptV1_0TargetTest successful on the device built
with BOARD_VNDK_VERSION=current and [system] namespace config is applied
to /data/nativetest[64]/* processes.
Change-Id: I0b441791e395798e80a84592ca01e771bb1c201a
2017-08-16 23:32:54 +09:00
Narayan Kamath
8310613c37
Merge "zip_archive: reject files that don't start with an LFH signature." into oc-mr1-dev
...
am: b669c3311b
2017-08-16 14:02:30 +00:00
Narayan Kamath
b669c3311b
Merge "zip_archive: reject files that don't start with an LFH signature." into oc-mr1-dev
2017-08-16 13:58:49 +00:00
Jocelyn Bohr
4a6626980c
Merge "Pass in message_version_ received from the secure side." am: 1a955faab2 am: 4e8bbb968c am: 3a5d47af18
...
am: eb7207dbcd
2017-08-16 00:25:56 +00:00
Jocelyn Bohr
eb7207dbcd
Merge "Pass in message_version_ received from the secure side." am: 1a955faab2 am: 4e8bbb968c
...
am: 3a5d47af18
2017-08-16 00:13:37 +00:00
Christopher Ferris
a7144996b3
Merge "Decrease size of LogBufferElements to 32 bytes." into oc-mr1-dev
...
am: 0ef26c63da
2017-08-16 00:07:41 +00:00
Hung-ying Tyan
52723d68f9
Merge "Remove nvram trusty implementation." into oc-mr1-dev
...
am: 46691ee85c
2017-08-16 00:07:04 +00:00
Jocelyn Bohr
3a5d47af18
Merge "Pass in message_version_ received from the secure side." am: 1a955faab2
...
am: 4e8bbb968c
2017-08-16 00:04:05 +00:00
