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

22946 Commits

Author SHA1 Message Date
Mattias Nissler e21165406f Merge changes from topic \'boringssl_conversion\' am: 52eb93c am: 0781351 
am: 9c4a0e0

* commit '9c4a0e021607f9da6130658530110e84eefc8ed9':
  Switch fs_mgr and adb to libcrypto_utils.
  Add libcrypto_utils.

Change-Id: Ifc84a632bfc58b6d7034d3feb3cc435ef706c54f
 2016-04-13 01:50:10 +00:00
Mark Salyzyn ea54f236f1 Merge "logcat: apct test failures" am: 90c2e75 am: ab2075a 
am: ac8bcae

* commit 'ac8bcae4f75beb2617837ff9cb70c61acc0311bc':
  logcat: apct test failures

Change-Id: I3609f3605d6b131124a4986bb0a63c91d678f815
 2016-04-13 01:50:10 +00:00
Daniel Rosenberg 72696ed3f9 resolve merge conflicts of 2857bd1 to nyc-dev am: e3a3288 
am: dde4e5a

* commit 'dde4e5a07118ae805d3a2b7d7e2c75e68d966625':
  Add nofail fstab option

Change-Id: I26d22aa4be684018ff8968e0ab2127849e43a3f9
 2016-04-13 01:50:09 +00:00
Daniel Rosenberg 431e9a14bf Fix overflow in path building 
An incorrect size was causing an unsigned value
to wrap, causing it to write past the end of
the buffer.

Bug: 28085658
Change-Id: Ie9625c729cca024d514ba2880ff97209d435a165
 2016-04-12 23:39:58 +00:00
Elliott Hughes 9c4a0e0216 Merge changes from topic \'boringssl_conversion\' am: 52eb93c 
am: 0781351

* commit '07813516502d12cfeabef94838e916c0cf4f3b46':
  Switch fs_mgr and adb to libcrypto_utils.
  Add libcrypto_utils.

Change-Id: Ib50abd66d546a2b2c7a1249043e1b39c2147c674
 2016-04-12 23:22:11 +00:00
Treehugger Robot ac8bcae4f7 Merge "logcat: apct test failures" am: 90c2e75 
am: ab2075a

* commit 'ab2075a9d3717c60df63aed00d1b605aad884a64':
  logcat: apct test failures

Change-Id: I3caf1cd746ec7a43918a7028d836ba05ec7275ee
 2016-04-12 23:22:10 +00:00
Mattias Nissler 0781351650 Merge changes from topic \'boringssl_conversion\' 
am: 52eb93c

* commit '52eb93ca57fa2f93be7e762392abb93c0b4c9210':
  Switch fs_mgr and adb to libcrypto_utils.
  Add libcrypto_utils.

Change-Id: I5c3af35b4b20cc50ca6a97889d811194267711b7
 2016-04-12 23:19:21 +00:00
Mark Salyzyn ab2075a9d3 Merge "logcat: apct test failures" 
am: 90c2e75

* commit '90c2e75db9093ae7c6fa6ef117ab795755b8b2ea':
  logcat: apct test failures

Change-Id: Ib64d056b04db734cf404bfb9ce4211a777ed3941
 2016-04-12 23:19:21 +00:00
Elliott Hughes 52eb93ca57 Merge changes from topic 'boringssl_conversion' 
* changes:
  Switch fs_mgr and adb to libcrypto_utils.
  Add libcrypto_utils.
 2016-04-12 23:12:35 +00:00
Treehugger Robot 90c2e75db9 Merge "logcat: apct test failures" 2016-04-12 23:11:56 +00:00
Mattias Nissler 097b6bbc76 Switch fs_mgr and adb to libcrypto_utils. 
Update code and dependencies to use BoringSSL + libcrypto_utils
instead of mincrypt.

Change-Id: Ic75164bd50c84b81b6310e27a67d4b3c174984f9
 2016-04-12 23:04:11 +00:00
Daniel Rosenberg dde4e5a071 resolve merge conflicts of 2857bd1 to nyc-dev 
am: e3a3288

* commit 'e3a3288dddcde8c180dfe2935335ca3c475e37a2':
  Add nofail fstab option

Change-Id: I42d1d4862f9f630999f2479b9a9b9e14431fe8bf
 2016-04-12 22:46:28 +00:00
Mark Salyzyn 3842b1a5f6 logcat: apct test failures 
Bug: 27241615
Change-Id: I100a5071c059fe9fa85bbdc33db552b16d7bdf60
 2016-04-12 22:36:04 +00:00
Christopher Wiley 9d2b2fd02e Merge "binderwrapper: Resolve ambiguous base::Closure reference" am: 979ce0e am: b0144b5 
am: 85dd915

* commit '85dd9157e1a82076e4c4bb8f60d16b15aef45248':
  binderwrapper: Resolve ambiguous base::Closure reference

Change-Id: I115a97a9dd4ea16b0111057e8c5d536e21719255
 2016-04-12 22:25:54 +00:00
Treehugger Robot 85dd9157e1 Merge "binderwrapper: Resolve ambiguous base::Closure reference" am: 979ce0e 
am: b0144b5

* commit 'b0144b5b999148de06b091383b40e5f6d12cd977':
  binderwrapper: Resolve ambiguous base::Closure reference

Change-Id: Icea03c86507cc5a4f333ee3644465fbc92a8521c
 2016-04-12 22:15:20 +00:00
Christopher Wiley b0144b5b99 Merge "binderwrapper: Resolve ambiguous base::Closure reference" 
am: 979ce0e

* commit '979ce0e33827a9c5bb2b76b2e2557544f8eb0cce':
  binderwrapper: Resolve ambiguous base::Closure reference

Change-Id: Iad3fbac9a0636e2ded698557c871ba00cf428276
 2016-04-12 22:12:28 +00:00
Mattias Nissler b62146dcab Add libcrypto_utils. 
This provides a tiny library implementing encode/decode functionality
for Android's custom RSA public key binary format. Keys are encoded
from and decoded to BoringSSL RSA key objects.

Change-Id: I55e5522d557e0e9f35927a87b6581f020ee34e7a
 2016-04-12 15:08:01 -07:00
Treehugger Robot 979ce0e338 Merge "binderwrapper: Resolve ambiguous base::Closure reference" 2016-04-12 21:48:45 +00:00
Daniel Rosenberg e3a3288ddd resolve merge conflicts of 2857bd1 to nyc-dev 
Change-Id: I3dc666cd44deb3e8438c2a482328f79e7a67e81e
 2016-04-12 14:28:09 -07:00
Christopher Wiley 6fd9e68aad Merge "healthd: Explicitly reference headers from libbinder" am: 911982d am: c2fd0b6 
am: 54cba24

* commit '54cba246b88e193c986e94392fe7a53797d5c48e':
  healthd: Explicitly reference headers from libbinder

Change-Id: Id70a026221e9c1ef85178fb5789d0c0c8546a5ac
 2016-04-12 21:15:12 +00:00
Treehugger Robot 54cba246b8 Merge "healthd: Explicitly reference headers from libbinder" am: 911982d 
am: c2fd0b6

* commit 'c2fd0b6e8966c554eb78d012cefd9d9685871700':
  healthd: Explicitly reference headers from libbinder

Change-Id: Ia3f2c9fad18f712c1089c119b247702a54c19f6e
 2016-04-12 21:09:08 +00:00
Daniel Rosenberg 2857bd1e44 Add nofail fstab option 
am: d38e3c5

* commit 'd38e3c522c162972bb348c0258e3f9e975191c4f':
  Add nofail fstab option

Change-Id: I3cdf284fe188c4f3874b91d8b77d17157160d68d
 2016-04-12 21:08:41 +00:00
Christopher Wiley c2fd0b6e89 Merge "healthd: Explicitly reference headers from libbinder" 
am: 911982d

* commit '911982d8b56c1f68818628637fbee3cb7273878f':
  healthd: Explicitly reference headers from libbinder

Change-Id: I089dd01dc531d549b87bdef54d9fd931865665e4
 2016-04-12 21:02:58 +00:00
Treehugger Robot 911982d8b5 Merge "healthd: Explicitly reference headers from libbinder" 2016-04-12 20:55:32 +00:00
Christopher Wiley 09910f4baa binderwrapper: Resolve ambiguous base::Closure reference 
Disambiguate between base and android::base namespaces.  This matters
when headers from libbase are indirectly included.

Bug: 27804373
Test: Compiles in that referenced situation.

Change-Id: Icb26595bb0013733aa8c03971c9f4a950c8b2ab1
 2016-04-12 13:19:29 -07:00
Christopher Wiley 22399089ef healthd: Explicitly reference headers from libbinder 
When creating static libs with healthd logic, explicitly
reference libbinder to pick up its header include paths.

Bug: 27804373
Test: healthd libs compile when libbinder's header include
      paths change.

Change-Id: I1014eb0b73d06815c42a527c4ea7e63c35ca3530
 2016-04-12 13:07:18 -07:00
Elliott Hughes 173cc4b7a8 Merge "Fix toolbox failure return to match similar tools." am: 5aef89b am: fc4f951 
am: 0efb678

* commit '0efb67869fe778ff0f20c56d5b4585a200c666aa':
  Fix toolbox failure return to match similar tools.

Change-Id: I62a7b7d2e1399e62f0e7bf2bd5fccf311a25f23f
 2016-04-12 18:57:55 +00:00
James Hawkins 8b736bab3f Merge "bootstat: Differentiate system update boot times." into nyc-dev am: c264813 
am: 973af5f

* commit '973af5f3824572254a80b83d56c0f17485590a1f':
  bootstat: Differentiate system update boot times.

Change-Id: I847bdaf66948412f7c8540442ce833169821ef68
 2016-04-12 18:57:54 +00:00
Elliott Hughes 0efb67869f Merge "Fix toolbox failure return to match similar tools." am: 5aef89b 
am: fc4f951

* commit 'fc4f951a6cf578ca142d2b0bf694a54cc01a5671':
  Fix toolbox failure return to match similar tools.

Change-Id: I64a482b542bd775402b63c705eb8f5a9867455bb
 2016-04-12 18:53:58 +00:00
James Hawkins 973af5f382 Merge "bootstat: Differentiate system update boot times." into nyc-dev 
am: c264813

* commit 'c2648132d2dc5874bb49de4efdf1d9a2e12eb6e8':
  bootstat: Differentiate system update boot times.

Change-Id: I67a70f0af9198a9e0c4e712f65d5d21ad5c36df8
 2016-04-12 18:48:39 +00:00
Elliott Hughes fc4f951a6c Merge "Fix toolbox failure return to match similar tools." 
am: 5aef89b

* commit '5aef89b3a340f5634a0de32590c9ea9722cb6e99':
  Fix toolbox failure return to match similar tools.

Change-Id: I8f6143f9e63ce927c9614972502323a3907734b5
 2016-04-12 18:48:14 +00:00
Elliott Hughes 5aef89b3a3 Merge "Fix toolbox failure return to match similar tools." 2016-04-12 18:32:58 +00:00
James Hawkins c2648132d2 Merge "bootstat: Differentiate system update boot times." into nyc-dev 2016-04-12 17:45:53 +00:00
Elliott Hughes 22b3567e88 Fix toolbox failure return to match similar tools. 
Bug: https://code.google.com/p/android/issues/detail?id=182226
Change-Id: Ib05709b8f9b474d5989b69abd949a6dc661af998
 2016-04-12 08:40:43 -07:00
Elliott Hughes 0d096d149d Merge "Clean up toolbox runner slightly." am: 2d7c1cd am: 0fdef9c 
am: c424eb7

* commit 'c424eb7c35884968d18f2b945ad161808e722fdb':
  Clean up toolbox runner slightly.

Change-Id: I165b6f9f80ab5e75f7458686e7d4255d8c39a5d9
 2016-04-12 15:40:04 +00:00
Elliott Hughes c424eb7c35 Merge "Clean up toolbox runner slightly." am: 2d7c1cd 
am: 0fdef9c

* commit '0fdef9c1878bfd73b0536c840f8415802197b0c3':
  Clean up toolbox runner slightly.

Change-Id: I6791da71a150fc11253d3bc2f2d958a2d694e527
 2016-04-12 15:28:29 +00:00
Elliott Hughes 0fdef9c187 Merge "Clean up toolbox runner slightly." 
am: 2d7c1cd

* commit '2d7c1cd96a92d3e7b6064b856c9b3fe279d901fe':
  Clean up toolbox runner slightly.

Change-Id: Ic4f4eef6ee51a81a99fcad87a8d8eabae1b01e42
 2016-04-12 15:22:58 +00:00
Elliott Hughes 2d7c1cd96a Merge "Clean up toolbox runner slightly." 2016-04-12 15:16:57 +00:00
Elliott Hughes ad2c07e4b5 Clean up toolbox runner slightly. 
Remove the weird @command syntax, and make toolbox itself list the available
commands, like toybox does. Also stop special-casing toolbox itself.

Change-Id: I77dfaaf0cf42e375d866b77362dd8afa717fb2e1
 2016-04-11 17:45:49 -07:00
Dimitry Ivanov 5c149b6750 Allow vendors to extend the list of public libs am: b614045 
am: c426aef

* commit 'c426aeff9afaf6e54e4c4fa058cf57544b7e2332':
  Allow vendors to extend the list of public libs

Change-Id: I69ff7b3b5d818505cdf2651a70393a6c04575133
 2016-04-11 23:41:01 +00:00
Dimitry Ivanov c426aeff9a Allow vendors to extend the list of public libs 
am: b614045

* commit 'b614045894c99fb1d35179d3e0a0bab0d5dec666':
  Allow vendors to extend the list of public libs

Change-Id: I79a772cc0cb7c81113678a536e501c6fb83c010d
 2016-04-11 23:34:50 +00:00
Dimitry Ivanov 289a6404e1 resolve merge conflicts of 663c998 to nyc-dev-plus-aosp 
am: 03890da

* commit '03890daa4eef70a192c91c2929a7e4dc5549bd63':
  Allow vendors to extend the list of public libs

Change-Id: Ic6754bffadf8c5ce6f2f925d155e4f3fdd9f5bd7
 2016-04-11 20:29:02 +00:00
Dimitry Ivanov 03890daa4e resolve merge conflicts of 663c998 to nyc-dev-plus-aosp 
Change-Id: I73530375b015a7701acda1c6e0ddb5b4ca6a032c
 2016-04-11 13:18:35 -07:00
Dimitry Ivanov b614045894 Allow vendors to extend the list of public libs 
native_loader adds libraries specified in the
(optional) file: /vendor/etc/public.libraries.txt
to the list of public native libraries.

Bug: http://b/27073931
Change-Id: I927193cce99d48c3395bd0e6c373ae9fad0f13f4
(cherry picked from commit 617f495cf7)
 2016-04-11 13:13:18 -07:00
Dimitry Ivanov 663c998b26 Merge "Allow vendors to extend the list of public libs" 
am: dc727ef

* commit 'dc727ef1f0dc7fd9e780dfb529d02790a2c85e5a':
  Allow vendors to extend the list of public libs

Change-Id: Icfdf967fd60544065cff3bab883f6d511a2fcfd8
 2016-04-11 20:08:49 +00:00
Dimitry Ivanov dc727ef1f0 Merge "Allow vendors to extend the list of public libs" 2016-04-11 20:03:16 +00:00
James Hawkins 8886b62e94 Merge "bootstat: Differentiate system update boot times." am: a5fef89 am: fe0e70d 
am: 09eb597

* commit '09eb597a38512ea9b625d60e14094028bf5f435f':
  bootstat: Differentiate system update boot times.

Change-Id: I844a6b70f72e11e434c035f7ec085be1fbcba15d
 2016-04-11 17:24:45 +00:00
James Hawkins 09eb597a38 Merge "bootstat: Differentiate system update boot times." am: a5fef89 
am: fe0e70d

* commit 'fe0e70d3db1bf135a0826c22f00c121488dfeb95':
  bootstat: Differentiate system update boot times.

Change-Id: I87cede4d262189bb3d53850a29bad525f9712915
 2016-04-11 17:19:55 +00:00
James Hawkins 2a5d4245a3 bootstat: Differentiate system update boot times. 
Bug: 27454343
Change-Id: Idb2e6f55ad7dda546a486954201619bb73cee6b0
(cherry picked from commit b9cf77159a)
 2016-04-11 10:17:46 -07:00
James Hawkins fe0e70d3db Merge "bootstat: Differentiate system update boot times." 
am: a5fef89

* commit 'a5fef898145b97fffdccf30199a952c42ff0ee4e':
  bootstat: Differentiate system update boot times.

Change-Id: I5f1f1828aa40630b33617834e2f2b9601a05964a
 2016-04-11 17:14:56 +00:00