Commit graph

23632 commits

Author SHA1 Message Date
Dan Willemsen
e42cfef51b Merge \"Convert more Android.mk files to Android.bp\"
am: 4c06cd8634

Change-Id: If16db842b2a10ee328b2a8e30e12aeb0a5611e05
2016-07-14 04:55:34 +00:00
Dan Willemsen
4c06cd8634 Merge "Convert more Android.mk files to Android.bp" 2016-07-14 04:49:21 +00:00
Elliott Hughes
dab2cd94ef Merge \"Remove dead rotate90CW_4x4_16v6.S.\"
am: 8add6456df

Change-Id: Ic2e00cfe4826a5e96ef47be0a3363804639f2ddf
2016-07-14 02:09:30 +00:00
Treehugger Robot
8add6456df Merge "Remove dead rotate90CW_4x4_16v6.S." 2016-07-14 01:58:19 +00:00
Elliott Hughes
b3e7495f2c Remove dead rotate90CW_4x4_16v6.S.
Change-Id: I3b7ee192cdbe193878fe9b4d97be972780283ef1
2016-07-13 17:58:34 -07:00
Nikola Veljkovic
b36ebd0593 Merge \"Replace .align with .balign to avoid ambiguity\"
am: 78ea54f735

Change-Id: I7f6b755f800a2f51161d42d5676184616d3ab775
2016-07-14 00:44:59 +00:00
Hans Boehm
2b67ca305e Merge \"Add test for RefBase etc.\"
am: dc9fbc3440

Change-Id: I77ead7f91c17ee8c5614da783152ac3478fc5342
2016-07-14 00:44:58 +00:00
Dan Willemsen
45f05240c2 Convert more Android.mk files to Android.bp
These modules have their dependencies satisfied, and aren't doing
anything strange.

Change-Id: I72039a15256cbd5e5eee0d79a15d66d74a6c087d
2016-07-13 17:41:45 -07:00
Treehugger Robot
78ea54f735 Merge "Replace .align with .balign to avoid ambiguity" 2016-07-13 21:08:49 +00:00
Hans Boehm
dc9fbc3440 Merge "Add test for RefBase etc." 2016-07-13 20:36:16 +00:00
Nikola Veljkovic
1109f115bd Replace .align with .balign to avoid ambiguity
Directive .align is arch-dependent, .balign is not.

Change-Id: Ibf2097da29f743f2c87c79d2a88ce1abd0aa6227
2016-07-13 22:13:02 +02:00
Jorge Lucangeli Obes
dba909bd9e resolve merge conflicts of 1b9b273 to stage-aosp-master
Change-Id: I12a541cb698d1df866b8be4dc1e35cb99e6f1e64
2016-07-13 15:23:45 -04:00
Hans Boehm
4a8276c779 Add test for RefBase etc.
Add some basic tests for RefBase, as well as a more ambitious memory
ordering test.

Add a README.txt with instructions to run the tests.

Comment out a couple of BlobCache tests that failed consistently and
appeared to be incorrect.  With that fix, I managed to run
libutils_tests successfully on device.

Bug: 28705989
Change-Id: I8ad29995097a149a0cc38615d6ed37117ec6cb5c
2016-07-13 12:03:03 -07:00
Treehugger Robot
1b9b27351a Merge "Extract the FUSE implementation from the main sdcard.c file." 2016-07-13 18:48:05 +00:00
Lazar Trsic
79233b4169 Merge \"[mips] Resolve issue with .align directive, when using clang IAS\"
am: 6b82eec610

Change-Id: If079ba185ac0406fddd1a1788798f1b4d6c0f0b8
2016-07-13 18:34:52 +00:00
Treehugger Robot
6b82eec610 Merge "[mips] Resolve issue with .align directive, when using clang IAS" 2016-07-13 18:32:11 +00:00
Mark Salyzyn
6fb57f996a Merge \"logcatd: trampoline persist.logd.logpersistd to logd.logpersistd\"
am: 3ba829c75c

Change-Id: Iec3c591d5121be9451597e90b9a6467d7c9a6986
2016-07-13 18:02:23 +00:00
Treehugger Robot
3ba829c75c Merge "logcatd: trampoline persist.logd.logpersistd to logd.logpersistd" 2016-07-13 17:45:45 +00:00
Lazar Trsic
980b632683 [mips] Resolve issue with .align directive, when using clang IAS
Clang IAS does not support .align without args, concrete value is needed.

Change-Id: I50e20c374b8e88966310c0c9e6cc41eea054eb32
2016-07-13 15:37:41 +00:00
Jorge Lucangeli Obes
c255f25ccb Extract the FUSE implementation from the main sdcard.c file.
sdcard.c is a *really* big file. This makes it hard to do things like
improving priv dropping or adding more sandboxing. Extract all
FUSE-related code to a separate unit, fuse.{h|c}, which exports only
two functions. Convert the rest of sdcard.c to C++ as sdcard.cpp.
fuse.c is kept as C (at least for now) since interacting with the FUSE
API is realistically easier from C.

Bug: 30110940

Change-Id: I188bfdc21c184742117e07539adb09090d4d747c
2016-07-13 10:57:29 -04:00
Dan Willemsen
8333a913b8 Merge \"libutils: Limit integer sanitize to target only\"
am: fc36f6fab6

Change-Id: I6bab757829cffa84f6bdae3edfa81597567704ce
2016-07-13 08:21:40 +00:00
Treehugger Robot
fc36f6fab6 Merge "libutils: Limit integer sanitize to target only" 2016-07-13 08:17:17 +00:00
Dan Willemsen
e16bdb1bd1 libutils: Limit integer sanitize to target only
This matches what the Android.mk defined, and should temporarily fix
builds that were broken with:

system/core/libutils/Unicode.cpp:225:12: runtime error: unsigned integer
overflow: 0 - 1 cannot be represented in type 'size_t' (aka 'unsigned
long')

Change-Id: I0363b42fc2d62dfd2d05649c9aa9ef0be573e20a
2016-07-13 00:20:20 -07:00
Colin Cross
2fedbf79bb resolve merge conflicts of 41e82a3 to stage-aosp-master
Change-Id: I5a7faca3249f0c038914540b1dd29edf0084c0e1
2016-07-12 23:53:04 -07:00
Colin Cross
41e82a3ca5 Merge changes I6f0df904,I8b578f67
* changes:
  Convert libziparchive from Android.mk to Android.bp
  Convert libbacktrace, libutils to Soong
2016-07-13 06:18:36 +00:00
Colin Cross
45566ba879 Convert libziparchive from Android.mk to Android.bp
Change-Id: I6f0df9046b848ee8b841ae0a608a6adc981788e7
2016-07-12 21:01:08 -07: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
2e1591bef9 Convert libbacktrace, libutils to Soong
Change-Id: I8b578f671f92246aca61f98937d75a60b56bc5c6
2016-07-12 17:20:18 -07:00
Dan Willemsen
eee8e7face libcutils: Switch to Android.bp
Change-Id: If36cb30e8e4432f1a5c7f9a6d30a75c012a4c67c
2016-07-12 16:37:08 -07: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
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
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
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
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
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