Commit Graph

7352 Commits

Author SHA1 Message Date
Colin Cross 74a41f5adf am b659ffd7: am deb3eecd: Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"
* commit 'b659ffd77d8495e5ac13c4fa3b6717c9945f7b9f':
  Fix the definition of LOCAL_PATH in libusbhost/Android.mk
2014-02-22 08:25:49 +00:00
Colin Cross b659ffd77d am deb3eecd: Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk"
* commit 'deb3eecd061e8a3a5f19ef5e10296f248f247881':
  Fix the definition of LOCAL_PATH in libusbhost/Android.mk
2014-02-22 08:21:47 +00:00
Colin Cross deb3eecd06 Merge "Fix the definition of LOCAL_PATH in libusbhost/Android.mk" 2014-02-22 08:16:03 +00:00
Alex Ray 4fc8231c18 Merge "graphics: Add colorspace definitions" into klp-volantis-dev 2014-02-21 23:54:05 +00:00
Elliott Hughes 24d06bc9c6 am bed58bf3: am 536dce31: Merge "Fix compiler warnings in libpixelflinger"
* commit 'bed58bf36fa9870fb0920c0c51e065e9a4eb3f5e':
  Fix compiler warnings in libpixelflinger
2014-02-20 22:31:05 +00:00
Elliott Hughes bed58bf36f am 536dce31: Merge "Fix compiler warnings in libpixelflinger"
* commit '536dce31d35e9411c03102d6abd837cd4d54ce55':
  Fix compiler warnings in libpixelflinger
2014-02-20 22:28:48 +00:00
Elliott Hughes 536dce31d3 Merge "Fix compiler warnings in libpixelflinger" 2014-02-20 22:22:17 +00:00
Ashok Bhat 3078b13b98 Fix compiler warnings in libpixelflinger
Change-Id: I6a5708ae6bc934b196d59d81a6cd550b05ed704f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-20 14:21:55 -08:00
Nick Kralevich 490963a54e am c0f95624: am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."
* commit 'c0f95624ad071d925de3463f7fa5aef0663076a0':
  Add -D option to restorecon for relabeling /data/data.
2014-02-20 21:02:54 +00:00
Nick Kralevich c0f95624ad am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."
* commit '783eb1689871850c082e0b6ccadeeccbaa81a5d2':
  Add -D option to restorecon for relabeling /data/data.
2014-02-20 21:00:36 +00:00
Nick Kralevich 783eb16898 Merge "Add -D option to restorecon for relabeling /data/data." 2014-02-20 20:54:18 +00:00
Elliott Hughes 60d2f35cbd am 8e66265a: am acc0a23a: Merge "Remove dead code."
* commit '8e66265a17e5e13843bd59282b1feacdae4b4b41':
  Remove dead code.
2014-02-20 20:15:57 +00:00
Elliott Hughes 8e66265a17 am acc0a23a: Merge "Remove dead code."
* commit 'acc0a23a20bf5e5db985661b2c8a8259d9e94498':
  Remove dead code.
2014-02-20 20:12:51 +00:00
Elliott Hughes acc0a23a20 Merge "Remove dead code." 2014-02-20 20:06:38 +00:00
Elliott Hughes b784f37341 Remove dead code.
We have benchmarking for memset in bionic itself, and a benchmarking
framework for other native benchmarking.

Change-Id: I241a288a96d3b2d37f3d51b04a519ac23f18a989
2014-02-20 11:12:41 -08:00
JP Abgrall c8178c8565 am a0d4b9e8: am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"
* commit 'a0d4b9e8430c94a951fc8b53ca83fad20c5e11e7':
  Handle FUSE_FSYNCDIR as FUSE_FSYNC
2014-02-19 20:43:44 +00:00
JP Abgrall e752589dcb am 406f1aff: am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"
* commit '406f1aff9acebfea81568e0a257e1300e22dcfa8':
  sdcard: direct I/O file access write buffer alignment
2014-02-19 20:43:42 +00:00
JP Abgrall a0d4b9e843 am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"
* commit '912373005b53e70803cdae61dd63a18fa73a5e3e':
  Handle FUSE_FSYNCDIR as FUSE_FSYNC
2014-02-19 20:41:30 +00:00
JP Abgrall 406f1aff9a am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"
* commit '3b0c24e28d7538ff5b49a98eee99bac85c8e687b':
  sdcard: direct I/O file access write buffer alignment
2014-02-19 20:37:59 +00:00
JP Abgrall 912373005b Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC" 2014-02-19 20:34:21 +00:00
Daisuke Okitsu b2831a2db9 Handle FUSE_FSYNCDIR as FUSE_FSYNC
There have been issues with sdcard data corruption even after
successfully calling fsync for /sdcard. This is caused by
the sdcard daemon doing nothing in this case.

Change-Id: I48149ceabdac79ac535b35c2598bb1fbb5410883
2014-02-19 20:33:50 +00:00
JP Abgrall 3b0c24e28d Merge "sdcard: direct I/O file access write buffer alignment" 2014-02-19 20:30:25 +00:00
Nick Kralevich f10492d8c0 am 066cde92: am 223e0798: Merge "Enable building init with -Wall -Werror."
* commit '066cde92d267986424ff79f35881116da3c672f8':
  Enable building init with -Wall -Werror.
2014-02-19 19:19:06 +00:00
Nick Kralevich 066cde92d2 am 223e0798: Merge "Enable building init with -Wall -Werror."
* commit '223e07983718e1515f2a54542b9b0163a8f508ed':
  Enable building init with -Wall -Werror.
2014-02-19 19:13:39 +00:00
Nick Kralevich 223e079837 Merge "Enable building init with -Wall -Werror." 2014-02-19 19:09:30 +00:00
Stephen Smalley eb3f421e02 Enable building init with -Wall -Werror.
Eliminates various warnings from SELinux-related code.

Bug: 12587913
Change-Id: I28921f0ebd934324436609540d95ccef58552b64
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-19 09:15:09 -05:00
Alex Ray c9f3bcf87b graphics: Add colorspace definitions
Change-Id: I54230dc2c0e481228457e8a01a50d300c917e657
2014-02-18 16:54:21 -08:00
Stephen Smalley 500308a7e6 Add -D option to restorecon for relabeling /data/data.
This depends on change I137588013ed1750315702c0dbe088ce3e4a29e83.

Change-Id: I5a4fef9affd6cddf98d72dc9d54899be25741779
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-18 11:15:52 -05:00
Arpad Horvath 49e9344bdd sdcard: direct I/O file access write buffer alignment
It is not enough to align the read buffer only, because
consequent writes might still fail with EINVAL. The write
buffer should be also aligned according to the write(2)
manual page.

Change-Id: I7547dec5208732c56f4466c1b0c88f36dabacf5b
2014-02-18 10:18:25 +01:00
Colin Cross ee9de136c5 am bb2da79f: am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"
* commit 'bb2da79fdab68c9643a30f5156e7dcabb379b139':
  Start debuggerd64 for 64-bit processes
2014-02-16 19:54:13 +00:00
Colin Cross bb2da79fda am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"
* commit '27fd413d6d02a53c453cf926717b67e9a8d1eb32':
  Start debuggerd64 for 64-bit processes
2014-02-16 19:50:59 +00:00
Colin Cross 27fd413d6d Merge "Start debuggerd64 for 64-bit processes" 2014-02-16 19:46:55 +00:00
Dan Willemsen 78ef91aa5e Start debuggerd64 for 64-bit processes
Change-Id: I2fc33d9eb2726b043d2f13bfab0c605dbb6083c7
2014-02-16 11:30:27 -08:00
JP Abgrall a183eb3e73 am 6e6140e0: am f7cf1a06: Merge "sdcard: direct I/O file access fix"
* commit '6e6140e0ad0575496cfbd6dd3c1eec5d53cb6e6a':
  sdcard: direct I/O file access fix
2014-02-15 01:01:20 +00:00
JP Abgrall 6e6140e0ad am f7cf1a06: Merge "sdcard: direct I/O file access fix"
* commit 'f7cf1a062ef27b6579b9afb876d635a307b3d5d3':
  sdcard: direct I/O file access fix
2014-02-15 00:59:15 +00:00
JP Abgrall f7cf1a062e Merge "sdcard: direct I/O file access fix" 2014-02-15 00:52:54 +00:00
Arpad Horvath 80b435a3f3 sdcard: direct I/O file access fix
If a file is opened in direct I/O mode (with O_DIRECT flag),
the read buffer addess must be aligned to memory page size
boundary. The Direct I/O is not needed for normal files,
however, some special hardware access (e.g. smart SD cards)
will not work without it.

Change-Id: I42babeee86dba1880fd23e2592fddd7060da3e20
2014-02-14 16:50:27 -08:00
Colin Cross 1fef485fcc am 2bcf2437: am d0307bee: Merge "charger: add locale global variable"
* commit '2bcf2437c80dbb1d7520b2a5688d4ad7b38dad51':
  charger: add locale global variable
2014-02-13 21:19:16 +00:00
Colin Cross 2bcf2437c8 am d0307bee: Merge "charger: add locale global variable"
* commit 'd0307beeef57b9db06b82f1ffba746c5decb0b72':
  charger: add locale global variable
2014-02-13 21:15:42 +00:00
Colin Cross d0307beeef Merge "charger: add locale global variable" 2014-02-13 21:09:37 +00:00
Colin Cross c5f3e0dc09 am 594f0917: am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"
* commit '594f0917000de7cc8bd8f184eede96a17cafd777':
  build debuggerd and debuggerd64 on 64-bit architectures
2014-02-13 20:35:38 +00:00
Colin Cross 594f091700 am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"
* commit 'a6b770566e62196f2fff8ab25952c33deed90ea8':
  build debuggerd and debuggerd64 on 64-bit architectures
2014-02-13 20:30:14 +00:00
Colin Cross ca0e5044a3 charger: add locale global variable
Some functions in minui reference a global extern char *locale.  None
of them are used by charger, but the bfd linker cannot optimize them
out and fails to link charger.  Define char *locale in charger.c
so it can resolve the symbol.

Change-Id: I738daf95d24356bf96bd226d91a5dc64b5d4dc9b
2014-02-13 12:25:21 -08:00
Colin Cross a6b770566e Merge "build debuggerd and debuggerd64 on 64-bit architectures" 2014-02-13 20:24:47 +00:00
Colin Cross 579c9bc8a4 build debuggerd and debuggerd64 on 64-bit architectures
Change-Id: I1518d45ae0c5e0fed31d071fdaf19a67bad1bdfc
2014-02-12 22:32:26 -08:00
Nick Kralevich e41420bd8c am 488b5eaf: am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '488b5eafe368781077b367a9afd68db303bc8891':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:12:52 +00:00
Nick Kralevich 488b5eafe3 am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '2e7347d617b02b13d227bb4cecf6bd69b7b20fa9':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 23:19:02 +00:00
Nick Kralevich 2e7347d617 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:28 +00:00
Colin Cross 28613a3c44 am f094fd03: am dc97eec0: Merge "pixelflinger: support multilib builds"
* commit 'f094fd035f343b3704b3574ce0005fc0e4666db5':
  pixelflinger: support multilib builds
2014-02-12 22:19:48 +00:00
Elliott Hughes fcd4dad396 am 620a8800: am 1c1bd845: Merge "x86_64: Add atomic funtions"
* commit '620a8800577743023490cd24b73a4d0a5b755d6e':
  x86_64: Add atomic funtions
2014-02-12 22:19:47 +00:00