Commit Graph

23622 Commits

Author SHA1 Message Date
Dan Willemsen c7b34dc4a5 Merge \\"libcutils: Switch to Android.bp\\" am: bc6c52f905
am: 4e8bb3e677

Change-Id: Ieb91f7c4925817fbdb0bba7b94a103752797aa08
2016-07-13 00:44:51 +00:00
Dan Willemsen 4e8bb3e677 Merge \"libcutils: Switch to Android.bp\"
am: bc6c52f905

Change-Id: Ie2beefe7f9992740ada57d6ab989abb74d257c5b
2016-07-13 00:41:15 +00:00
Treehugger Robot bc6c52f905 Merge "libcutils: Switch to Android.bp" 2016-07-13 00:39:06 +00:00
Dan Willemsen eee8e7face libcutils: Switch to Android.bp
Change-Id: If36cb30e8e4432f1a5c7f9a6d30a75c012a4c67c
2016-07-12 16:37:08 -07:00
Colin Cross 5a36d1beca Merge \\"Rename Android.soong.mk to Android.mk\\" am: b07df4dd3f
am: 68bfe51348

Change-Id: I49b87b72fa204930fe4e4a6e7d65586f76d13a6a
2016-07-12 16:23:18 +00:00
Colin Cross 68bfe51348 Merge \"Rename Android.soong.mk to Android.mk\"
am: b07df4dd3f

Change-Id: I9d9a232539b9991ab935e143140a3b77d896ebc7
2016-07-12 16:20:21 +00:00
Colin Cross b07df4dd3f Merge "Rename Android.soong.mk to Android.mk" 2016-07-12 16:15:55 +00:00
Greg Kaiser 0c9b9ec4dc Merge \\"RefBase: Silence compiler warnings\\" am: f76ca2a43b
am: 3b43562535

Change-Id: Ifc19df587c4f0ef993200fdb6757fe3f3813bc67
2016-07-12 00:17:48 +00:00
Colin Cross c5ba0110d4 Merge \\"Convert libbase Android.mk to Android.bp\\" am: df252716f6
am: 3407c053c3

Change-Id: Ie9e2684c451d6591f5778ad320a8d534331ba557
2016-07-12 00:15:36 +00:00
Greg Kaiser 3b43562535 Merge \"RefBase: Silence compiler warnings\"
am: f76ca2a43b

Change-Id: I4a146e36db49fc336baa7a59f8fbea0ca1dbb084
2016-07-12 00:15:19 +00:00
Colin Cross 3407c053c3 Merge \"Convert libbase Android.mk to Android.bp\"
am: df252716f6

Change-Id: Ia7b88a586bb06ba3a86db7afc65eb38b8cf82241
2016-07-12 00:13:02 +00:00
Treehugger Robot f76ca2a43b Merge "RefBase: Silence compiler warnings" 2016-07-12 00:10:24 +00:00
Treehugger Robot df252716f6 Merge "Convert libbase Android.mk to Android.bp" 2016-07-12 00:10:10 +00:00
Colin Cross b39e4025ae Rename Android.soong.mk to Android.mk
Soong is always on now, so we don't have to distinguish between
makefiles that should be ignored because Soong is handling them with an
Android.bp file, and makefiles that are still needed with Soong.  All
obsolete Android.mk files have been removed, rename all Android.soong.mk
files to Android.mk.

Change-Id: Iabbddcbfb2c837cfd4556241b570474452cc5d4d
2016-07-11 16:56:51 -07:00
Greg Kaiser d9885e7edb RefBase: Silence compiler warnings
We comment out the names of the parameters we're intentionally
not using.

(cherrypick of 44a0eb4d8cdf4ab881f5d5a1acc1155266a46f6a.)

Change-Id: I0a92d9200ca26cdc4700d2ff9e3ab33c102520d5
2016-07-11 16:11:30 -07:00
Tim Kryger f789bd0133 Merge \\"Remove attempt to write sched_compat_yield\\" am: 3f2db32b8c
am: 49a986bf73

Change-Id: Ia7770ca197adfa050a773fb514b8033717a78407
2016-07-11 21:34:09 +00:00
Tim Kryger 49a986bf73 Merge \"Remove attempt to write sched_compat_yield\"
am: 3f2db32b8c

Change-Id: I13c56436dd00cf2d5336ba757ae2c32d2e2504b5
2016-07-11 21:31:08 +00:00
Tim Kryger 3f2db32b8c Merge "Remove attempt to write sched_compat_yield" 2016-07-11 21:24:52 +00:00
Colin Cross fc06bd0ca3 Convert libbase Android.mk to Android.bp
Change-Id: I429d0a06c5138c3e54c9d25f15adb3e2647496e1
2016-07-11 14:23:32 -07:00
Elliott Hughes a7cb85ce8e resolve merge conflicts of 743b0c5 to stage-aosp-master
am: 619875061d

Change-Id: Iafbb322783f81cf16468afafaf97be701aa6c9ef
2016-07-11 21:03:57 +00:00
Elliott Hughes 619875061d resolve merge conflicts of 743b0c5 to stage-aosp-master
Change-Id: I17c32128b1c376927319183fa78eb60044a7d0b5
2016-07-11 13:59:03 -07:00
Elliott Hughes 743b0c5e35 Merge "Switch run-as to libpackagelistparser." 2016-07-11 20:53:11 +00:00
Tim Kryger 724dfbac70 Remove attempt to write sched_compat_yield
The sched_compat_yield option was eliminated in Linux 2.6.38 by commit
ac53db596cc0 ("sched: Use a buddy to implement yield_task_fair()") and
as a result, the following error is printed to the log during boot up.

init: write_file: Unable to open '/proc/sys/kernel/sched_compat_yield':
No such file or directory"

Bug: 30034121
Change-Id: Idbdb68de0cb3ab1f67d82a4d66af880bcfdfe261
2016-07-11 11:41:56 -07:00
Jorge Lucangeli Obes 77dbaad7b9 Merge \\"Refactor Service::Start method.\\" am: 82d2bcc21e
am: f2ffdac47a

Change-Id: Ib7818912dd753cf40c61146c26674102bdbed338
2016-07-11 17:17:05 +00:00
Jorge Lucangeli Obes f2ffdac47a Merge \"Refactor Service::Start method.\"
am: 82d2bcc21e

Change-Id: Icccd918f1dc02010c9aceb4560dc5ff18849d8a5
2016-07-11 17:13:26 +00:00
Treehugger Robot 82d2bcc21e Merge "Refactor Service::Start method." 2016-07-11 17:08:45 +00:00
Jorge Lucangeli Obes 344d01f99f Refactor Service::Start method.
This CL extracts code from Service::Start into four helper functions,
bringing Service::Start down to 134 lines vs 212 lines originally. This
makes the method a lot easier to follow. There is no change in behaviour.

Also, make error messages consistent (start with lowercase) and
format Service::Start to fit in 100 cols.

Bug: 30035168

Change-Id: If979976fba4d339a336d030f802ca9f169fd012c
2016-07-11 09:57:17 -04:00
Dan Willemsen a5b9b8f452 Merge \\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\" am: 5d420e791b
am: bdd01e86a5

Change-Id: I6205590b79d8325edd5b15e4933a80b2d11238a1
2016-07-09 06:05:52 +00:00
Dan Willemsen bdd01e86a5 Merge \"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\"
am: 5d420e791b

Change-Id: I3a65ccc6bc5d6b3c63484baaa6d816939bd48073
2016-07-09 06:03:09 +00:00
Dan Willemsen 5d420e791b Merge "Use BOARD_USES_VENDORIMAGE to detect vendor image presence" 2016-07-09 05:57:55 +00:00
Dan Willemsen 0790431f75 Use BOARD_USES_VENDORIMAGE to detect vendor image presence
When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.

Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
2016-07-08 18:17:48 -07:00
Elliott Hughes 7288ac3982 Merge \\"Make klog_fd thread-safe and make klog_init a no-op.\\" am: 588b770063
am: 73d363bbc1

Change-Id: I48fcc144efb7e6e4de4620bfa5815123247c94d6
2016-07-08 17:09:08 +00:00
Elliott Hughes 73d363bbc1 Merge \"Make klog_fd thread-safe and make klog_init a no-op.\"
am: 588b770063

Change-Id: I884276a8f8b8209f6e956c5fb410e8265184e1b5
2016-07-08 17:05:25 +00:00
Elliott Hughes 588b770063 Merge "Make klog_fd thread-safe and make klog_init a no-op." 2016-07-08 17:01:13 +00:00
Erik Kline 9f31416013 Merge \\"Add UIDs for system DNS and tethering DNS\\" am: c4dc4f3fc2
am: fcf3ed51dc

Change-Id: Icaeffaa67c3cc5c2452843b92577dd7bdab01146
2016-07-08 08:51:43 +00:00
Erik Kline fcf3ed51dc Merge \"Add UIDs for system DNS and tethering DNS\"
am: c4dc4f3fc2

Change-Id: I40d246a3d4c293797ae5204cebd61b50c4021205
2016-07-08 08:48:11 +00:00
Treehugger Robot c4dc4f3fc2 Merge "Add UIDs for system DNS and tethering DNS" 2016-07-08 08:43:55 +00:00
Elliott Hughes 0c8bf5798f Switch run-as to libpackagelistparser.
We already have to have a Java and a native implementation; we don't
need _two_ native implementations.

Change-Id: I0201205ce5079ef9c747abc37b0c8122cf8fb136
2016-07-07 16:50:32 -07:00
Mark Salyzyn 4c04c98a31 Merge \\"logcat: help spelling correction\\" am: 20a172fca7
am: 59cce987ec

Change-Id: I5d1019e7b25601b8ad22b8a2fd728ee64ffd081f
2016-07-06 21:49:12 +00:00
Mark Salyzyn 59cce987ec Merge \"logcat: help spelling correction\"
am: 20a172fca7

Change-Id: I2fd638e43b9d4f677d55a9c7b2e7c8eebfce5b0a
2016-07-06 21:46:29 +00:00
Treehugger Robot 20a172fca7 Merge "logcat: help spelling correction" 2016-07-06 21:36:07 +00:00
Mark Salyzyn e735a7305b logcat: help spelling correction
threadtime and added clarity for adverbs

Bug: 29916087
Change-Id: Idbed8bc74147c105eaced940d035d0649a244b18
2016-07-06 13:33:57 -07:00
Mark Salyzyn b6dbe28746 Merge \\"logcat: format verbs and adverbs\\" am: 82fb012a03
am: b13d0ce160

Change-Id: I2b6d0772a5e3db4b539db0c4facca583cabe92c1
2016-07-06 20:32:07 +00:00
Mark Salyzyn b13d0ce160 Merge \"logcat: format verbs and adverbs\"
am: 82fb012a03

Change-Id: I1f897abc493f63195fff505c37746ee9e82cfac1
2016-07-06 20:27:29 +00:00
Treehugger Robot 82fb012a03 Merge "logcat: format verbs and adverbs" 2016-07-06 20:18:00 +00:00
Mark Salyzyn a8dbadd54e Merge \\"libcutils: canned_fs_config.c drop tabs\\" am: 4ee9ed5366
am: ec129fe06c

Change-Id: I365d06333de78629f36fb94adf035f70a299e291
2016-07-06 18:56:34 +00:00
Mark Salyzyn ec129fe06c Merge \"libcutils: canned_fs_config.c drop tabs\"
am: 4ee9ed5366

Change-Id: Ie72d7562be3316d2ebe732dd1d1fbd4a04b6557b
2016-07-06 18:54:23 +00:00
Treehugger Robot 4ee9ed5366 Merge "libcutils: canned_fs_config.c drop tabs" 2016-07-06 18:50:22 +00:00
Mark Salyzyn 9cfd1c6ebc logcat: format verbs and adverbs
Bug: 29916087
Change-Id: I039c95b9dc0aa88f1219121513899934381453ae
2016-07-06 11:16:07 -07:00
Mark Salyzyn 768cbb0404 libcutils: canned_fs_config.c drop tabs
- replace tabs with spaces, get indent right
- Sort header order as per Android coding standard

Change-Id: I634f6f716a368ce5565ccc880c51406042f312bf
2016-07-06 10:45:11 -07:00