Commit graph

37681 commits

Author SHA1 Message Date
Elliott Hughes
28db530ee4 Merge "Remove dead dlmalloc stubs." am: 2736aec411
am: 3f958ed641

Change-Id: Icd6df972b4e15bd5badc45442e06298214584586
2017-11-13 17:27:29 +00:00
Elliott Hughes
3f958ed641 Merge "Remove dead dlmalloc stubs."
am: 2736aec411

Change-Id: I65ad892394b8ec7b9e1bc50849b17ebd48efee89
2017-11-13 17:24:55 +00:00
Elliott Hughes
2736aec411 Merge "Remove dead dlmalloc stubs." 2017-11-13 17:22:20 +00:00
Sandeep Patil
bee3639ab1 Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" am: 6b07ee9fb5 -s ours
am: 6cdd5f9002  -s ours

Change-Id: I3e307c755a38bfea3146f05c97f12eccc6f7658c
2017-11-13 16:41:11 +00:00
Sandeep Patil
6cdd5f9002 Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back"
am: 6b07ee9fb5  -s ours

Change-Id: Ice1295f8e8a6e3aac3bc561fdb2d5d86c56647ea
2017-11-13 16:38:42 +00:00
Treehugger Robot
6b07ee9fb5 Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back" 2017-11-13 16:36:34 +00:00
Bowgo Tsai
71096ca58a Merge "first stage mount: abort when failed to parse fstab in device-tree" am: d0d7346dc7
am: 9a9469faeb

Change-Id: I771fb1be04a12e8166292442a70b9529368c88b5
2017-11-11 01:53:51 +00:00
Bowgo Tsai
9a9469faeb Merge "first stage mount: abort when failed to parse fstab in device-tree"
am: d0d7346dc7

Change-Id: I46322f29c00a54bb6623eeb57c6fc3f076d942f0
2017-11-11 01:51:14 +00:00
Treehugger Robot
d0d7346dc7 Merge "first stage mount: abort when failed to parse fstab in device-tree" 2017-11-11 01:48:30 +00:00
Elliott Hughes
fa10b2bf8d Merge "fastboot: show how long extraction takes." am: 0626f7205e
am: 178b010713

Change-Id: I6e1f6cc010632c030e3618f3cc5e3b989ba0ddba
2017-11-11 01:06:15 +00:00
Elliott Hughes
178b010713 Merge "fastboot: show how long extraction takes."
am: 0626f7205e

Change-Id: I2fb3109f0ea97480e07d8a1245a13ebdc5240285
2017-11-11 01:04:43 +00:00
Elliott Hughes
0626f7205e Merge "fastboot: show how long extraction takes." 2017-11-11 00:59:29 +00:00
Elliott Hughes
4320727b68 Merge "Move libcutils source to C++." am: d2ce2f4f45
am: ba3b6a2851

Change-Id: Ifa80cbb1767cd54883e801963631bb7ddd5614c7
2017-11-11 00:41:29 +00:00
Elliott Hughes
ba3b6a2851 Merge "Move libcutils source to C++."
am: d2ce2f4f45

Change-Id: Ieeb013ede9e4ef00a1b90dc42c71cc6412e83415
2017-11-11 00:28:15 +00:00
Elliott Hughes
1412f5ffe3 Remove dead dlmalloc stubs.
Used to be used by ART, but long gone.

Bug: N/A
Test: ran tests
Change-Id: Id231d97b2b797562619e6fd90536b17dbe39f71e
2017-11-10 16:24:18 -08:00
Sandeep Patil
25f1631aa7 DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back
Taimen bootloader passes androidboot.slot for now.
This reverts commit 211a4a5d5a.

Bug: 68710251
Test: taimen successfully mounts partition in first stage
Change-Id: I046afc99120e7ec9ef4b8ea7a852eb70e7231ea9
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-11-10 16:20:27 -08:00
Elliott Hughes
d2ce2f4f45 Merge "Move libcutils source to C++." 2017-11-11 00:18:29 +00:00
Yifan Hong
13e202c56d Merge "libvndksupport: do not use functions from android/dlext.h" am: 865f9c2f0a
am: 9dbbfdc1a5

Change-Id: Id80f4fe163bf2b79677d2545597ca5f8092851d0
2017-11-10 23:45:52 +00:00
Yifan Hong
9dbbfdc1a5 Merge "libvndksupport: do not use functions from android/dlext.h"
am: 865f9c2f0a

Change-Id: Ibe43d9ac637cf9021e87211b84e9ed5a0f93ab36
2017-11-10 23:40:52 +00:00
Treehugger Robot
865f9c2f0a Merge "libvndksupport: do not use functions from android/dlext.h" 2017-11-10 23:34:08 +00:00
Tianjie Xu
2ca0bbfae3 Merge "Create a new directory on boot for update_engine logs" am: 78d882bb5f
am: 5d86509d19

Change-Id: I01611463c081fafd60fc315a4a91418a4ddef22a
2017-11-10 22:14:35 +00:00
Tianjie Xu
5d86509d19 Merge "Create a new directory on boot for update_engine logs"
am: 78d882bb5f

Change-Id: I7685ae024fa7fcc49b4fcb6dd8b4f5f753cff239
2017-11-10 22:12:03 +00:00
Tianjie Xu
78d882bb5f Merge "Create a new directory on boot for update_engine logs" 2017-11-10 22:06:53 +00:00
Yifan Hong
1ccdb7d92a libvndksupport: do not use functions from android/dlext.h
... if they are not available. Use weak symbols and do not call the
following functions when they are not defined:

* android_dlopen_ext
* android_get_exported_namespace
Test: links
Test: boots

Change-Id: I653548bac61a0eba001f72bab969b5b858bd1553
2017-11-10 13:19:37 -08:00
Elliott Hughes
8e9aeb9053 Move libcutils source to C++.
Just the minimial changes to get this to actually build, because otherwise
we always bog down trying to rewrite everything (when the real answer
is usually "stop using libcutils, it's awful").

This doesn't move a handful of files: two are basically just BSD libc
source, a couple have outstanding code reviews, and one can be deleted
(but I'll do that in a separate change).

I'm also skipping the presubmit hooks because otherwise clang-format
wants to reformat everything. I'll follow up with that...

Bug: N/A
Test: builds
Change-Id: I06403f465b67c8e493bad466dd76b1151eed5993
2017-11-10 13:18:10 -08:00
Chenbo Feng
d5c327e879 Merge changes from topic "qtaguidReplace" am: 6707ef139d
am: 45eca0a011

Change-Id: Ie4801a92ba6231d3fdabe8435913f7a47c00f3a2
2017-11-10 18:42:50 +00:00
Chenbo Feng
45eca0a011 Merge changes from topic "qtaguidReplace"
am: 6707ef139d

Change-Id: I2d55815030878d871d585e956f4a82623e64b12a
2017-11-10 18:39:30 +00:00
Treehugger Robot
6707ef139d Merge changes from topic "qtaguidReplace"
* changes:
  Redirect qtaguid native call to netd fwmark client
  Move qtaguid API out of libcutils
2017-11-10 18:34:36 +00:00
Elliott Hughes
23af112314 fastboot: show how long extraction takes.
Before:
  extracting android-info.txt (0 MB)...
  extracting boot.img (29 MB)...
  target reported max download size of 536870912 bytes
  archive does not contain 'boot.sig'
  archive does not contain 'boot_other.img'
  archive does not contain 'dtbo.img'
  archive does not contain 'dt.img'
  archive does not contain 'recovery.img'
  extracting system.img (1928 MB)...
  archive does not contain 'system.sig'
  extracting system_other.img (574 MB)...
  archive does not contain 'system.sig'
  archive does not contain 'vbmeta.img'

After:
  extracting android-info.txt (0 MB) to RAM...
  extracting boot.img (29 MB) to disk... took 0.232s
  target reported max download size of 536870912 bytes
  archive does not contain 'boot.sig'
  archive does not contain 'boot_other.img'
  archive does not contain 'dtbo.img'
  archive does not contain 'dt.img'
  archive does not contain 'recovery.img'
  extracting system.img (1928 MB) to disk... took 10.122s
  archive does not contain 'system.sig'
  extracting system_other.img (574 MB) to disk... took 3.424s
  archive does not contain 'system.sig'
  archive does not contain 'vbmeta.img'

Bug: http://b/69128980
Test: ran manually
Change-Id: Ib190d1cc56ad9da06a4f9a9e822f7dad4a9a53b7
2017-11-10 08:43:16 -08:00
Bowgo Tsai
ec19cf6306 first stage mount: abort when failed to parse fstab in device-tree
The client of FirstStageMount class should check the existence of fstab
in device-tree prior to using it. So raising a FATAL error inside
FirstStageMount when failed to parsing the fstab, in order to expose
more accurate error messages.

Also fixing a comment in fs_mgr, where it might happen in either
non-A/B or A/B.

Bug: 69102431
Test: boot sailfish
Change-Id: Ifb525beaa3423b118644778bfe0f84bff9465303
2017-11-10 12:53:46 +08:00
Justin Yun
7987bd77f3 Merge changes from topic "libvndksupport_cp" am: c021b75cfd
am: fb47bcc4c8  -s ours

Change-Id: Ia8c0b691087df5a5669d9c1a208100b07b9f14c3
2017-11-10 03:39:07 +00:00
Justin Yun
fb47bcc4c8 Merge changes from topic "libvndksupport_cp"
am: c021b75cfd

Change-Id: Ieacf06d5bc67aae7093f8a805bdf47f305a4b08f
2017-11-10 03:29:00 +00:00
Treehugger Robot
c021b75cfd Merge changes from topic "libvndksupport_cp"
* changes:
  Make libvndksupport look for default namespace as well.
  libvndksupport: Change log level and message.
2017-11-10 03:23:02 +00:00
Justin Yun
090b593a8d 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
Merged-In: I26208b6f47708f83e0679fd72ca7471ade84fff9
2017-11-09 18:07:47 -08:00
Justin Yun
a34bd0561d 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
Merged-In: I5ed6ba1e48f99e7d11d80a465177ac9f3a7fbd97
2017-11-09 18:07:41 -08:00
Chenbo Feng
baede73bd9 Redirect qtaguid native call to netd fwmark client
In order to replace qtaguid module with new eBPF network monitoring
module. We firstly move the current qtaguid userspace implementation
into netd and hide the detail from other processes. The current API will
talk to netd fwmark client to pass down the qtaguid related request from
high level framework and netd will use the proper method to complete the
request.

Test: Current TrafficStats CTS tests should not fail.
Bug: 30950746
Change-Id: Ie90c28f3594ab2877746b2372a1b6944768bfb18
2017-11-09 18:02:22 -08:00
Tianjie Xu
74fa3cab4e Create a new directory on boot for update_engine logs
Partners require to access update_engine's logs on the file system with
non-root permission.

Bug: 65568605
Test: directory created with the correct permission on boot
Change-Id: I1c1fb4acb8b0f2e7352ffa9e7d05a864940b5986
2017-11-09 12:11:28 -08:00
Josh Gao
331ef3a2a2 Merge "Move GetDeviceTest from adb's test_device.py to adb package." am: 93e5cd85d1
am: ffd7695147

Change-Id: I6b833086d09f9bc0d69c7c489739ab1c28129dbd
2017-11-09 01:06:04 +00:00
Josh Gao
ffd7695147 Merge "Move GetDeviceTest from adb's test_device.py to adb package."
am: 93e5cd85d1

Change-Id: I171474f876d1043bd507305a597c4572ad3dd52d
2017-11-09 01:04:11 +00:00
Treehugger Robot
93e5cd85d1 Merge "Move GetDeviceTest from adb's test_device.py to adb package." 2017-11-09 00:57:32 +00:00
Chenbo Feng
5b11831aa1 Move qtaguid API out of libcutils
The qtaguid kernel module will be deprecated on devices running 4.9
kernel or above and we need to support both old and new module in
userspace. Netd is responsible for choosing which kernel module to use
and all the current qtaguid native implementation need to be hided
behind it. So the current qtaguid native API implementation will be
moved to a isolate library under system/core and only netd can access to
it. The libcutils qtaguid API will become a wrapper to send request to
netd module. This modification will make sure the apps that currently
using this native API will not be broken.

Bug: 30950746
Test: All cts and vts test related should not fail.
Change-Id: I9de98a25ed5dc71bbf520ee0aadd16d59025699a
2017-11-08 16:28:43 -08:00
Josh Gao
85d4789719 Move GetDeviceTest from adb's test_device.py to adb package.
This test actually belongs with the adb python wrapper, since it's not
affected by changes to adb itself.

Bug: http://b/64260633
Test: python test_device.py
Change-Id: I58e5dff760f35923f8dbbdc7de6ffd75254880dc
2017-11-08 14:39:06 -08:00
Christopher Ferris
1a57a08bb5 Merge "Fix another nullptr dereference." am: 331d8e9b1a
am: 5ead5f7df9

Change-Id: I8911bbc38a09b7222d67736a9271bfc31c1beba4
2017-11-08 21:55:17 +00:00
Christopher Ferris
5ead5f7df9 Merge "Fix another nullptr dereference."
am: 331d8e9b1a

Change-Id: If3993e80f5c83bfecb332a8d37997b9a279a5e53
2017-11-08 21:53:11 +00:00
Christopher Ferris
331d8e9b1a Merge "Fix another nullptr dereference." 2017-11-08 21:49:24 +00:00
Christopher Ferris
d96cbae4d4 Fix another nullptr dereference.
In this case, if the .eh_frame_hdr doesn't exist, we would crash.

Bug: 68813077

Test: Pass new unit tests, verified that without the fix, the unit test
Test: would crash.
Change-Id: I4f1365a76fe5c2fb69fa106a1ef15889c14e7611
2017-11-08 11:04:48 -08:00
Mark Salyzyn
9b45da952c Merge "Buffer overrun in __android_log_is_loggable() fix" am: 35fc00124b
am: ec193f26eb

Change-Id: I7d46ddee38b267cf6523a7fca57f6705d89c9b5c
2017-11-08 16:13:51 +00:00
Mark Salyzyn
ec193f26eb Merge "Buffer overrun in __android_log_is_loggable() fix"
am: 35fc00124b

Change-Id: I07d351ef9a787782b303e7b5646f5ded55e093d3
2017-11-08 16:11:19 +00:00
Mark Salyzyn
35fc00124b Merge "Buffer overrun in __android_log_is_loggable() fix" 2017-11-08 16:06:38 +00:00
Christopher Ferris
5d8dded5cf Merge "Add support for only a .eh_frame." am: 58fb262613
am: fa9d130401

Change-Id: Ie2706499c372b013853043d06fe6f3933692988c
2017-11-08 15:37:56 +00:00