Commit Graph

41516 Commits

Author SHA1 Message Date
Mark Salyzyn fa284f0fdb Merge "bootstat: ppdone_timeout kernel panic"
am: e5aa7ee753

Change-Id: Idbedd218104a272458192123ddf889d5d9fb379b
2018-06-12 08:58:23 -07:00
Treehugger Robot e5aa7ee753 Merge "bootstat: ppdone_timeout kernel panic" 2018-06-12 15:47:02 +00:00
Bowgo Tsai 66e7d99fa7 Merge "fs_mgr: reorder getting boot config"
am: d0687a8aec

Change-Id: I37713926cb7c645929e037f570527ec770b0557a
2018-06-11 18:44:45 -07:00
Treehugger Robot d0687a8aec Merge "fs_mgr: reorder getting boot config" 2018-06-11 23:36:17 +00:00
Bowgo Tsai 128f764ec8 Merge "fs_mg: allow getting VBMeta Digest from device-tree"
am: ec9b6b73ff

Change-Id: I7a70a3a367bf12499c9271bc2c1aba584d3a726d
2018-06-11 09:20:55 -07:00
Bowgo Tsai 7481e6cceb fs_mgr: reorder getting boot config
The params in kernel cmdline is expected to be consumed by kernel.
For bootloader <--> userland communication, we're moving it to
device-tree or system property.

Bug: 78615592
Test: boot a device
Change-Id: I26bc2ea4cda91241242eb9fd0210b5b10659a297
2018-06-12 00:16:14 +08:00
Treehugger Robot ec9b6b73ff Merge "fs_mg: allow getting VBMeta Digest from device-tree" 2018-06-11 16:10:21 +00:00
Logan Chien 33526fe548 [automerger skipped] Merge "Add files to CleanSpec.mk"
am: 53fe135595  -s ours

Change-Id: I1d2680a2f9c3264de4302839c08d3b2cf6f3a1f5
2018-06-11 08:40:37 -07:00
Treehugger Robot 53fe135595 Merge "Add files to CleanSpec.mk" 2018-06-11 15:35:47 +00:00
Mark Salyzyn c3f618628f Merge "fs_mgr: fs_mgr_get_boot_config_from_kernel_cmdline deal with quote"
am: 7da6b579c1

Change-Id: Ibaf8be37766f8f942df6aab437cafc31616f2014
2018-06-11 07:36:19 -07:00
Treehugger Robot 7da6b579c1 Merge "fs_mgr: fs_mgr_get_boot_config_from_kernel_cmdline deal with quote" 2018-06-11 14:29:24 +00:00
Bowgo Tsai 3474297379 fs_mg: allow getting VBMeta Digest from device-tree
fs_mgr gets androidboot.vbmeta.{size, hash_alg, digest} from kernel
cmdline to assure the integrity of all vbmeta structs. This CL Allows
fs_mgr to get those parameters from device tree because they're only
consumed by userland instead of kernel.

  https://android.googlesource.com/platform/external/avb/+/master#The-VBMeta-Digest

Bootloader could construct a device tree overlay at run time then merge
it into main device tree. e.g.,

    firmware {
        android {
            vbmeta.size = "5245";
            vbmeta.hash_alg = "sha256";
            vbmeta.digest = "0c51233ca3ecaa...63c6d912e79b709";
        };
    };

Bug: 80168311
Test: boot a device using AVB

Change-Id: I6cf151713af04e6cf554d593e9f0b43e9e214d8c
2018-06-11 22:08:45 +08:00
Logan Chien 7881135fa9 Add files to CleanSpec.mk
This commit removes stale files from incremental builds:

* /system/etc/ld.config.txt,
* /system/etc/llndk.libraries.txt
* /system/etc/public.libraries.txt

These files are replaced by versioned ones.

Bug: 78605339
Test: Those files are removed in incremental builds
Merged-In: I7925fa45b47397829bde835ab3c479611faffa33
Change-Id: I7925fa45b47397829bde835ab3c479611faffa33
(cherry picked from commit 9afd9b488f)
2018-06-10 08:29:24 +09:00
Xin Li 59217467c4 Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master 2018-06-08 23:09:51 +00:00
Mark Salyzyn 596fac3c6d fs_mgr: fs_mgr_get_boot_config_from_kernel_cmdline deal with quote
Spans quoted with " are dealt with atomically, and are stripped from
the key/value results when parsing the kernel cmdline.

Test: compile, device boot, fs_mgr_unit_test
Bug: 109821005
Change-Id: I45f3d7395f34295edefdeaafa4c15c6ee25cc4da
2018-06-08 16:04:17 -07:00
Tao Bao f0d9162f79 Merge "Update shell and utilities doc on the use of dd and grep."
am: 3ee8926f5d

Change-Id: Icdf12beb6381bb4089ceb17b1cf7a09d7dbb5824
2018-06-08 12:45:34 -07:00
Tao Bao 3ee8926f5d Merge "Update shell and utilities doc on the use of dd and grep." 2018-06-08 19:30:04 +00:00
Xin Li ccc079171b Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I52d315b99d316f7265cc782a1dffd9c4c429c0ca
2018-06-08 11:09:21 -07:00
Mark Salyzyn 78e54fd0ab bootstat: ppdone_timeout kernel panic
Add kernel_panic,_sde_encoder_phys_cmd_handle_ppdone_timeout to help track
occurrences.

Test: compile
Bug: 67728931
Change-Id: I3306ae2936dc4355902e838d9ac8d8b11837348d
2018-06-08 10:37:06 -07:00
Tao Bao 6220400636 Update shell and utilities doc on the use of dd and grep.
We have moved away from BSD dd and grep, which is also shown in the
section for Android Q.

Test: N/A
Change-Id: I13484879e697a1cf2c8b82d7e28a167cb34c00fa
2018-06-08 12:52:56 -04:00
Tom Cherry 1d22bfd395 Merge "fs_mgr: remove some unused functions" am: 158dd05b8a
am: 30ab50af18

Change-Id: I713d9aed5a4ebecab6bc7d127c0b69d33ff57ffe
2018-06-07 21:50:02 -07:00
Mark Salyzyn 38a5ff731a Merge "fs_mgr: avb should use built-in kernel command line parser" am: e1bc807b7d
am: 6a435fac53

Change-Id: I71db5756d06beef0d453113b2ff0c13913665219
2018-06-07 21:48:55 -07:00
Tom Cherry 30ab50af18 Merge "fs_mgr: remove some unused functions"
am: 158dd05b8a

Change-Id: Ib170ec542fc181070113ef85973c03e1faeda6a8
2018-06-07 21:18:15 -07:00
Tom Cherry 158dd05b8a Merge "fs_mgr: remove some unused functions" 2018-06-08 02:27:03 +00:00
Mark Salyzyn 6a435fac53 Merge "fs_mgr: avb should use built-in kernel command line parser"
am: e1bc807b7d

Change-Id: Ib6d5118ca3863e2a6c9ab9f47298bb3d969aa5ef
2018-06-07 17:25:55 -07:00
Tom Cherry e6eabf42f2 fs_mgr: remove some unused functions
Test: build
Change-Id: I8a44f2f777fff369df06c73f06d53e448826f7b5
2018-06-07 16:49:01 -07:00
Treehugger Robot e1bc807b7d Merge "fs_mgr: avb should use built-in kernel command line parser" 2018-06-07 23:28:26 +00:00
Mark Salyzyn 346c52e972 fs_mgr: avb should use built-in kernel command line parser
Switch from open-coded parsing of /proc/cmdline to built-in
fs_mgr_get_boot_config_from_kernel_cmdline function.

Test: compile and smoke boot test
Bug: 109821005
Change-Id: I935d2e76c76ad417cbcee398e2afbf9b061d1719
2018-06-07 14:45:08 -07:00
Bernie Innocenti 27ddccf081 Merge "libsysutils: Delete dead code: FrameworkClient" am: 5911204326
am: a702b009be

Change-Id: I1946bdc7fd15fd3f460705c848fb0275e9cd0dc8
2018-06-07 11:29:21 -07:00
Bernie Innocenti 5408cd4d2a Merge "clang-format: Double-indent continuation lines" am: 9be5f2df0a
am: 3d1b54b24d

Change-Id: If21766b53fcb1e126afb3c7449233a09f6a10d16
2018-06-07 11:26:42 -07:00
Bernie Innocenti a702b009be Merge "libsysutils: Delete dead code: FrameworkClient"
am: 5911204326

Change-Id: I348fbb7ab872ca6a2d8d51118155a264b843c2d0
2018-06-07 10:47:31 -07:00
Bernie Innocenti 3d1b54b24d Merge "clang-format: Double-indent continuation lines"
am: 9be5f2df0a

Change-Id: Ibbc0e7f21d0f038ee3a7b690bcbbcb9f88b7e831
2018-06-07 10:45:53 -07:00
Treehugger Robot 5911204326 Merge "libsysutils: Delete dead code: FrameworkClient" 2018-06-07 16:44:24 +00:00
Treehugger Robot 9be5f2df0a Merge "clang-format: Double-indent continuation lines" 2018-06-07 16:44:04 +00:00
Bernie Innocenti 246d35d02b libsysutils: Delete dead code: FrameworkClient
Test: mm
Change-Id: I372f2aa8d7f7e3f5ce1cd9399292bef9e4900de7
2018-06-07 20:20:01 +09:00
Bernie Innocenti 68ba3c3d9a clang-format: Double-indent continuation lines
The default value for ContinuationIndentWidth inherited from the Google
style is 4. Since .clang-format-4 doubles the value of IndentWidth
from 2 to 4, it should also double ContinuationIndentWidth to retain
Google's double-indent style.

Before:

 void forEachInterface(
     const std::string& dirname,
     const std::function<void(const std::string& path)) {
     fn(dirname, "default");
     DIR* dir = opendir(dirname.c_str());

After this patch:

 void forEachInterface(
         const std::string& dirname,
         const std::function<void(const std::string& path)) {
     fn(dirname, "default");
     DIR* dir = opendir(dirname.c_str());

Test: applied to libsysutils/src/*.cpp and compared output.
Change-Id: I75c50fa9becd5291a17047933f443cc6db77838a
2018-06-07 19:57:57 +09:00
Pirama Arumuga Nainar 7d2fc04d1b Merge "Fix exit-time-destructor warning" am: ae74e42d25
am: a40b43eb45

Change-Id: I949f06ec7335a9f0fd6b285885b214d0cbe038b9
2018-06-06 18:58:32 -07:00
Elliott Hughes 2c4611523d Merge "libbase: fix libbase_test.logging.StdioLogger." am: 5dfe1e81d4
am: 01ffe657b3

Change-Id: I2a2fbc4f26277f965f90837a5efeb330c51d7330
2018-06-06 18:56:45 -07:00
Pirama Arumuga Nainar a40b43eb45 Merge "Fix exit-time-destructor warning"
am: ae74e42d25

Change-Id: Iaba5af629a1eeaf2e5d7abe5f94662119adea424
2018-06-06 17:12:45 -07:00
Elliott Hughes 01ffe657b3 Merge "libbase: fix libbase_test.logging.StdioLogger."
am: 5dfe1e81d4

Change-Id: I0feb62a44f83e2b43dd7e48d58b9592cc0935899
2018-06-06 17:10:23 -07:00
Treehugger Robot ae74e42d25 Merge "Fix exit-time-destructor warning" 2018-06-06 23:28:07 +00:00
Elliott Hughes fa1b4ca7db Merge "Try to fix LocalUnwinderTest.unwind_after_dlopen in APCT." am: 063183f203
am: a0e9af8ab7

Change-Id: I2573edd97419a85bb4feb9f9d89ab294427da003
2018-06-06 15:52:55 -07:00
Pirama Arumuga Nainar 8b47d316d2 Fix exit-time-destructor warning
By initializing the global handle_list on the heap.

Test: Run Clang-built adb_test.exe under wine
Change-Id: I2326011b7e44c6d0cb4721d4b68fde7188b87c38
2018-06-06 14:41:26 -07:00
Treehugger Robot 5dfe1e81d4 Merge "libbase: fix libbase_test.logging.StdioLogger." 2018-06-06 21:41:17 +00:00
Elliott Hughes a0e9af8ab7 Merge "Try to fix LocalUnwinderTest.unwind_after_dlopen in APCT."
am: 063183f203

Change-Id: If21b1035a75c2403d6b1a199a30984cc2dcf8132
2018-06-06 13:34:15 -07:00
Elliott Hughes 11a64eb0e8 libbase: fix libbase_test.logging.StdioLogger.
I don't think the StdioLogger test ever passed. Move GetFileBasename
to where we can use it from StdioLogger, and undo the mix of anonymous
namespace vs static to consistently use static (which is the majority)
while we're touching those lines.

Bug: N/A
Test: ran tests
Change-Id: I95b3966cdb8af642bed71752bd7d4e3a86ac84ca
2018-06-06 12:54:41 -07:00
Elliott Hughes 063183f203 Merge "Try to fix LocalUnwinderTest.unwind_after_dlopen in APCT." 2018-06-06 19:47:02 +00:00
Elliott Hughes f6d7594d7f Try to fix LocalUnwinderTest.unwind_after_dlopen in APCT.
Failure:

  system/core/libunwindstack/tests/LocalUnwinderTest.cpp:181: Failure
  Value of: handle != nullptr
  Actual: false
  Expected: true

Bug: N/A
Test: N/A
Change-Id: I89b3228d51961f7bf952dd01f12f4ee61a97fe91
2018-06-06 10:48:41 -07:00
Rubin Xu 4fd840ce86 Merge "Parse IfIndex for Netlink RTM_NEWADDR / RTM_DELADDR event" into pi-dev
am: 820ef15058

Change-Id: If81ce68dcb7981d1f732850dd7c43e37e87ae4e8
2018-06-06 06:54:58 -07:00
TreeHugger Robot 820ef15058 Merge "Parse IfIndex for Netlink RTM_NEWADDR / RTM_DELADDR event" into pi-dev 2018-06-06 13:51:24 +00:00