openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,404 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

16404 Commits

Author SHA1 Message Date
Daniel Rosenberg 516d30d502 Merge "rootdir: Create symlinks in Android.mk" 2015-08-04 01:00:48 +00:00
Elliott Hughes f7af90c9df am 3cf2a8e0: Merge "Fix a comment typo." 
* commit '3cf2a8e0ee7dbf504763cc446d5cf1ee451158fc':
  Fix a comment typo.
 2015-08-04 00:58:39 +00:00
Elliott Hughes 1da90f0c14 am feacf20d: Merge "adb: win32: file descriptor reliability improvements" 
* commit 'feacf20d1eb797c0edfc3c7a487fd93c63e8fd4a':
  adb: win32: file descriptor reliability improvements
 2015-08-04 00:58:37 +00:00
Daniel Rosenberg 390876539e am 13d62278: Merge "Skip mounting /, just mark block device as ro if needed." 
* commit '13d62278f4ecbd5ea29b7f3e0d43b9ced7aae439':
  Skip mounting /, just mark block device as ro if needed.
 2015-08-04 00:58:36 +00:00
Elliott Hughes 3cf2a8e0ee Merge "Fix a comment typo." 2015-08-04 00:51:38 +00:00
Daniel Rosenberg 595003a3d0 rootdir: Create symlinks in Android.mk 
system.img may contain the root directory as well. In that case, we
need to create some symlinks init.rc would during the build.

Change-Id: I4e7726f38c0f9cd9846c761fad1446738edb52c0
 2015-08-04 00:51:19 +00:00
Elliott Hughes feacf20d1e Merge "adb: win32: file descriptor reliability improvements" 2015-08-04 00:50:43 +00:00
Daniel Rosenberg 13d62278f4 Merge "Skip mounting /, just mark block device as ro if needed." 2015-08-04 00:50:40 +00:00
Daniel Rosenberg 31a4fafc15 Skip mounting /, just mark block device as ro if needed. 
Change-Id: I7fbb636d296abc1caab6c7bf88017684c9df7759
 2015-08-04 00:47:04 +00:00
Yusuke Sato 0ef97729c2 am 69386e33: am 81fd50c3: Merge "perfboot.py: ignore tags not listed in /system/etc/event-log-tags" 
* commit '69386e33b67eaee721b4e8d7bddbd4263302ff77':
  perfboot.py: ignore tags not listed in /system/etc/event-log-tags
 2015-08-04 00:28:44 +00:00
Yusuke Sato 69386e33b6 am 81fd50c3: Merge "perfboot.py: ignore tags not listed in /system/etc/event-log-tags" 
* commit '81fd50c3974f3fca37d4119477e11dc3f40b7172':
  perfboot.py: ignore tags not listed in /system/etc/event-log-tags
 2015-08-04 00:13:07 +00:00
Yusuke Sato 81fd50c397 Merge "perfboot.py: ignore tags not listed in /system/etc/event-log-tags" 2015-08-04 00:08:24 +00:00
Elliott Hughes bfa7c7d9e2 Fix a comment typo. 
Change-Id: Ifacb19b9c31ac81fbf02c8382eb0324ea79075b9
 2015-08-03 16:26:13 -07:00
Yusuke Sato e801cc0b4e perfboot.py: ignore tags not listed in /system/etc/event-log-tags 
This is a follow-up CL for http://ag/739815/.

Bug: 22207911
Change-Id: Ie5f529abc4b18454cea8a75a1438a5ea65dd90ab
 2015-08-03 15:56:53 -07:00
Elliott Hughes f5081bca44 am eee501ec: am 6b940e13: Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc" 
* commit 'eee501ece6d3d0add9f67ce2c71cef6620cf6bf5':
  adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc
 2015-08-03 21:47:31 +00:00
Elliott Hughes 18adeaff2c am 14c08745: am 6355f2c1: Merge "adb: win32: call SystemErrorCodeToString() from more places" 
* commit '14c08745ac3ff46330b545354664ffd3c8f60844':
  adb: win32: call SystemErrorCodeToString() from more places
 2015-08-03 21:47:19 +00:00
Elliott Hughes 64328f3a72 am c783e1a3: am 0fac7fd1: Merge "Leave the evidence lying around if an adb test fails." 
* commit 'c783e1a3f35675169b5ca85d3dc0f6a8c22ce901':
  Leave the evidence lying around if an adb test fails.
 2015-08-03 21:47:18 +00:00
Yusuke Sato f2a404b1f3 am 5e34b3ab: am 72488aa0: Merge "perfboot.py: warn if dm-verity is disabled" 
* commit '5e34b3abdb3cbc167fa86dab7a746c94f2bd4c6f':
  perfboot.py: warn if dm-verity is disabled
 2015-08-03 21:47:13 +00:00
Elliott Hughes 7c95915202 am 6eb9aa62: am 6bf93400: Merge "adb: fix mkdirs / adb pull with relative paths, fix win32 issues" 
* commit '6eb9aa62d3b112f004d39906d6994f37eabd95a3':
  adb: fix mkdirs / adb pull with relative paths, fix win32 issues
 2015-08-03 21:47:12 +00:00
Elliott Hughes ed196f6dae am c3766916: am 8c61e029: Merge "adb_test/libbase_test: win32: get some tests working" 
* commit 'c376691617623c26fe7eb14184f874214e2d2173':
  adb_test/libbase_test: win32: get some tests working
 2015-08-03 21:47:02 +00:00
Elliott Hughes 93d053ab96 am 07522aae: am bb3b45d2: Merge "libbase_test: win32: get some tests working" 
* commit '07522aae91efb55a658c8514162e1343fd28499b':
  libbase_test: win32: get some tests working
 2015-08-03 21:46:44 +00:00
Elliott Hughes eee501ece6 am 6b940e13: Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc" 
* commit '6b940e1349da720bdba4c5eeb9741e5fffe30913':
  adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc
 2015-08-03 21:28:15 +00:00
Tom Cherry 087cd35b79 resolved conflicts for merge of 0070026c to mnc-dr-dev-plus-aosp 
Change-Id: Ibc802572898b6913c1f5d94aaae19974bfc0eb85
 2015-08-03 14:19:35 -07:00
Elliott Hughes 6b940e1349 Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc" 2015-08-03 21:16:26 +00:00
Elliott Hughes 14c08745ac am 6355f2c1: Merge "adb: win32: call SystemErrorCodeToString() from more places" 
* commit '6355f2c1400b531fb71a46351a0c26e666af2e88':
  adb: win32: call SystemErrorCodeToString() from more places
 2015-08-03 21:09:43 +00:00
Elliott Hughes c783e1a3f3 am 0fac7fd1: Merge "Leave the evidence lying around if an adb test fails." 
* commit '0fac7fd15266f5d9ae0eddc76313d4383e31dfac':
  Leave the evidence lying around if an adb test fails.
 2015-08-03 21:09:41 +00:00
Elliott Hughes 6355f2c140 Merge "adb: win32: call SystemErrorCodeToString() from more places" 2015-08-03 21:04:01 +00:00
Elliott Hughes 0fac7fd152 Merge "Leave the evidence lying around if an adb test fails." 2015-08-03 21:03:35 +00:00
Elliott Hughes 3841a9f7cb Leave the evidence lying around if an adb test fails. 
Not seeing the full output from the failed adb command is probably
the biggest issue when debugging a test failure, but this doesn't
help either.

Change-Id: Ic42cbced8be252185a799b27c210a744188a4201
 2015-08-03 13:58:49 -07:00
Yusuke Sato 5e34b3abdb am 72488aa0: Merge "perfboot.py: warn if dm-verity is disabled" 
* commit '72488aa0fe060d9bb56c23e585e5aad55288c5ea':
  perfboot.py: warn if dm-verity is disabled
 2015-08-03 20:35:02 +00:00
Elliott Hughes 6eb9aa62d3 am 6bf93400: Merge "adb: fix mkdirs / adb pull with relative paths, fix win32 issues" 
* commit '6bf93400f344f4d438e3bc6f1bf3d6a7704ea2b5':
  adb: fix mkdirs / adb pull with relative paths, fix win32 issues
 2015-08-03 20:35:00 +00:00
Yusuke Sato 72488aa0fe Merge "perfboot.py: warn if dm-verity is disabled" 2015-08-03 20:26:47 +00:00
Elliott Hughes 6bf93400f3 Merge "adb: fix mkdirs / adb pull with relative paths, fix win32 issues" 2015-08-03 20:25:41 +00:00
Spencer Low 22191c30a6 adb: fix mkdirs / adb pull with relative paths, fix win32 issues 
Relative paths were being prefixed with OS_PATH_SEPARATOR on unix and
win32 causing adb to incorrectly try to make directories at the root.
Plus, absolute paths didn't work on win32 (C: got prefixed into \C:).

This fix is to use dirname (available on win32 via mingw's crt) to do
the messy parsing.

I added a test for the relative path case.

Change-Id: Ibb0a4a8ec7756351d252a4d267122ab18e182858
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
 2015-08-03 13:24:18 -07:00
Elliott Hughes c376691617 am 8c61e029: Merge "adb_test/libbase_test: win32: get some tests working" 
* commit '8c61e0297c95a61bd3891704e7530ca1436a6421':
  adb_test/libbase_test: win32: get some tests working
 2015-08-03 19:53:14 +00:00
Elliott Hughes 8c61e0297c Merge "adb_test/libbase_test: win32: get some tests working" 2015-08-03 19:45:08 +00:00
Spencer Low cf168a82e9 adb_test/libbase_test: win32: get some tests working 
adb_test:

* Fix adb_utils directory_exists test for Windows. The test actually
fails because directory_exists() is not aware of junctions or symlinks,
but I'm not really sure if that is a bad thing (since these are rare on
Windows to begin with).

* Fix crash during transport tests due to mutex not being initialized.

* io tests fail for various reasons (see adb_io_test.cpp for more info).

libbase_test:

* Get it building on Win32 by implementing mkstemp() and mkdtemp().

* Run StringPrintf %z test on Windows because it passes because we build
with __USE_MINGW_ANSI_STDIO which implements %z.

* I didn't fixup the logging tests: some logging tests fail because when
abort() is called on Windows, by default it pops up UI asking whether a
crash dump should be sent to Microsoft. To some degree this makes sense,
as I think LOG(FATAL) does crash dumping in Chromium. This should be
revisited in the future.

Change-Id: Iaa2433e5294ff162e0b2aa9fe6e4ec09a6893f7a
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
 2015-08-03 12:44:43 -07:00
Todd Kennedy fd41e5e5d9 am 1f6204a8: am 6782ca0b: Merge "Add a trace constant for PackageManager" 
* commit '1f6204a8856dd85dd3f83f692a4edf2c81c37cbd':
  Add a trace constant for PackageManager
 2015-08-03 19:33:01 +00:00
Elliott Hughes fc56cdb250 am d2984900: am 11ca81fc: Merge "Remove adb\'s unused get_my_path for Windows." 
* commit 'd29849007a37daf45e20e6d0f9f3232c2ad4fc30':
  Remove adb's unused get_my_path for Windows.
 2015-08-03 19:32:38 +00:00
Yusuke Sato b6c66dc0a3 perfboot.py: warn if dm-verity is disabled 
Disabling the feature sometimes skews benchmark results.

Bug: 22207911
Change-Id: Idedc7eb14e3cc4e8687b0c0e2975f10a3c4154e5
 2015-08-03 11:36:21 -07:00
Elliott Hughes 07522aae91 am bb3b45d2: Merge "libbase_test: win32: get some tests working" 
* commit 'bb3b45d27c9ef67c66efdec687325fa9707c6665':
  libbase_test: win32: get some tests working
 2015-08-03 18:04:46 +00:00
Yabin Cui 4f38fea313 am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection." 
* commit '20e8b384c6ad8718764e138cc9013623cad8f400':
  adb: poll for emulator connection.
 2015-08-03 18:01:57 +00:00
Jorge Lucangeli Obes 5f64984809 am 45ca3d54: am a336cbcd: Merge "Reserve new UID range for OEM." 
* commit '45ca3d54e0f6be4237efcef5ff121a263d81971d':
  Reserve new UID range for OEM.
 2015-08-03 18:01:50 +00:00
Tom Cherry 0070026c1b am 4247ebfd: Merge "init: use std::vector<std::string> for argument passing" 
* commit '4247ebfd2faefcfd7abf7a4cc4c85ce6c8b5125c':
  init: use std::vector<std::string> for argument passing
 2015-08-03 17:59:46 +00:00
Elliott Hughes 1d0abeca09 am b8b71186: am 367fb503: Merge "adb: win32: Unicode path names, env vars, some console support" 
* commit 'b8b7118614e8d6bd9a683ecd624915519f8933a9':
  adb: win32: Unicode path names, env vars, some console support
 2015-08-03 17:56:42 +00:00
Yusuke Sato adda8f7388 am 2f9e1db3: am b5d6ad81: Merge "Stop calling fsck on shutdown by default" 
* commit '2f9e1db37416cdb580d870218b5fbfbed47a3758':
  Stop calling fsck on shutdown by default
 2015-08-03 17:56:32 +00:00
Elliott Hughes bb3b45d27c Merge "libbase_test: win32: get some tests working" 2015-08-03 17:55:12 +00:00
Spencer Low 40d0c7aead libbase_test: win32: get some tests working 
* Get it building on Win32 by implementing mkstemp() and mkdtemp().

* Run StringPrintf %z test on Windows because it passes because we build
with __USE_MINGW_ANSI_STDIO which implements %z.

Change-Id: Ia01f94e8258503381a1df6d3da6e40de59e57125
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
 2015-08-03 10:54:17 -07:00
Tom Cherry 4247ebfd2f Merge "init: use std::vector<std::string> for argument passing" 2015-08-03 17:51:39 +00:00
Todd Kennedy 1f6204a885 am 6782ca0b: Merge "Add a trace constant for PackageManager" 
* commit '6782ca0b766c777ae285d2b7bcfcd8232ffe34d9':
  Add a trace constant for PackageManager
 2015-08-03 17:50:14 +00:00