Commit Graph

13585 Commits

Author SHA1 Message Date
Christopher Ferris 84dbd37b99 am ddeb9eaa: am cadf4284: am 4d9281da: Merge "Update the test for better output on error."
* commit 'ddeb9eaa1e6fc4b920b95cd6269d2a79c15647e5':
  Update the test for better output on error.
2015-04-03 14:52:56 +00:00
Elliott Hughes 1a0c61cce4 am 45ae15f9: am 49c381af: am 8e192f62: Merge "Fix Windows strlcpy.c build."
* commit '45ae15f9002cdd9117ac10079b112b987dc43717':
  Fix Windows strlcpy.c build.
2015-04-03 14:52:47 +00:00
Elliott Hughes bbc6e1bf86 am b4573331: am adc10102: am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
* commit 'b45733319dc269375d599da894eecd2ffa4211ff':
  Be more intention-revealing with libcutils' strlcpy.
2015-04-03 14:52:33 +00:00
Christopher Ferris ddeb9eaa1e am cadf4284: am 4d9281da: Merge "Update the test for better output on error."
* commit 'cadf428403314769f22d3b54b81d082294992ddc':
  Update the test for better output on error.
2015-04-03 01:15:19 +00:00
Christopher Ferris cadf428403 am 4d9281da: Merge "Update the test for better output on error."
* commit '4d9281dae8be449991d19e7408bc2aec10232dac':
  Update the test for better output on error.
2015-04-03 01:01:43 +00:00
Christopher Ferris 4d9281dae8 Merge "Update the test for better output on error." 2015-04-03 00:53:40 +00:00
Elliott Hughes 45ae15f900 am 49c381af: am 8e192f62: Merge "Fix Windows strlcpy.c build."
* commit '49c381af1af3ceb52615416a4a7faede669f0d70':
  Fix Windows strlcpy.c build.
2015-04-03 00:41:02 +00:00
Elliott Hughes 49c381af1a am 8e192f62: Merge "Fix Windows strlcpy.c build."
* commit '8e192f626edb59d106d73f8f7894823c47457f82':
  Fix Windows strlcpy.c build.
2015-04-03 00:31:40 +00:00
Elliott Hughes 8e192f626e Merge "Fix Windows strlcpy.c build." 2015-04-03 00:22:40 +00:00
Elliott Hughes 8193d41ea6 Fix Windows strlcpy.c build.
Change-Id: I572c553227a5a2cd57ec304de7e898d7c801fe93
2015-04-02 17:21:47 -07:00
Elliott Hughes b45733319d am adc10102: am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
* commit 'adc10102492a3d46478d6687a3cfcc4d6488c1fb':
  Be more intention-revealing with libcutils' strlcpy.
2015-04-03 00:08:54 +00:00
Elliott Hughes adc1010249 am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
* commit '4c1d4a0e8ec344799813ce5e6642946839e0036a':
  Be more intention-revealing with libcutils' strlcpy.
2015-04-02 23:54:37 +00:00
Elliott Hughes 4c1d4a0e8e Merge "Be more intention-revealing with libcutils' strlcpy." 2015-04-02 23:43:11 +00:00
Phil Burk 7c6f796df4 Merge "audio.h: add AUDIO_FORMAT_DTS" 2015-04-02 23:10:23 +00:00
Elliott Hughes 2040031f7b Be more intention-revealing with libcutils' strlcpy.
Several people have been independently confused about when this gets
built and why over the past couple of days.

Change-Id: I2d4a02f66e24c0734327585b7d27e50a344b1e94
2015-04-02 15:39:33 -07:00
Christopher Ferris 97e00bb25a Update the test for better output on error.
Change-Id: Id3b0b96a33441ce5d908aac38e639ac3598a7a89
2015-04-02 15:36:09 -07:00
Mark Salyzyn ee90e13b5d am dba7973f: am f7f8f15b: am 34efe4cf: Merge "mkbootfs: move fs_config to libcutils"
* commit 'dba7973f30902a4fd528543ce3018992b121c992':
  mkbootfs: move fs_config to libcutils
2015-04-02 22:25:52 +00:00
Elliott Hughes c72bd16ce8 am 8d2cd035: am 2ddb9cb1: am ed43be39: Merge "Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it\'s not needed."
* commit '8d2cd03547c76f6c670b33d4fe6d44b646c14b45':
  Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed.
2015-04-02 22:07:16 +00:00
Elliott Hughes 1c41dadef3 am 797b246f: am a1f69f18: am 21593186: Merge "Move all libcutils tests into the gtests."
* commit '797b246ff374e0fc3066a45545b8156f50f23267':
  Move all libcutils tests into the gtests.
2015-04-02 22:07:15 +00:00
Mark Salyzyn dba7973f30 am f7f8f15b: am 34efe4cf: Merge "mkbootfs: move fs_config to libcutils"
* commit 'f7f8f15bfbbc49342fe4258833ae56bf8cf5cb5b':
  mkbootfs: move fs_config to libcutils
2015-04-02 22:06:00 +00:00
Mark Salyzyn f7f8f15bfb am 34efe4cf: Merge "mkbootfs: move fs_config to libcutils"
* commit '34efe4cf1ad8d080b37fc02bf55e42eb2ea643b6':
  mkbootfs: move fs_config to libcutils
2015-04-02 21:55:03 +00:00
Elliott Hughes 8d2cd03547 am 2ddb9cb1: am ed43be39: Merge "Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it\'s not needed."
* commit '2ddb9cb106d13451cfd3d95fc8b4bc3619959900':
  Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed.
2015-04-02 21:50:14 +00:00
Mark Salyzyn 34efe4cf1a Merge "mkbootfs: move fs_config to libcutils" 2015-04-02 21:46:41 +00:00
Elliott Hughes 797b246ff3 am a1f69f18: am 21593186: Merge "Move all libcutils tests into the gtests."
* commit 'a1f69f180876b0d9a74dd967c1dfdabb3722a318':
  Move all libcutils tests into the gtests.
2015-04-02 21:45:02 +00:00
Elliott Hughes 2ddb9cb106 am ed43be39: Merge "Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it\'s not needed."
* commit 'ed43be3948b143af03ab52f0c9457fc35a44176c':
  Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed.
2015-04-02 21:44:47 +00:00
Elliott Hughes a1f69f1808 am 21593186: Merge "Move all libcutils tests into the gtests."
* commit '2159318647b6032a9d752012b923c579dc1f80da':
  Move all libcutils tests into the gtests.
2015-04-02 21:35:18 +00:00
Elliott Hughes ed43be3948 Merge "Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed." 2015-04-02 21:34:40 +00:00
Elliott Hughes bcc2b5f44a Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed.
Change-Id: I720b8ef1050da45a7833adef8219b6acb2cf3a38
2015-04-02 14:31:07 -07:00
Elliott Hughes 2159318647 Merge "Move all libcutils tests into the gtests." 2015-04-02 21:26:32 +00:00
Elliott Hughes af98efbd15 Move all libcutils tests into the gtests.
This also fixes the bug where we were always testing against the fake
strlcpy we provide for glibc/Windows rather than the Android one.

This also removes some unnecessary library dependencies.

This also builds all the cutils tests for the host (static and dynamic).

Change-Id: Icd129d5b025c0ca801be5acf31a54ecd88608df9
2015-04-02 14:25:55 -07:00
Elliott Hughes 97dd13fd4f am aaf25409: am 84ab5563: am d8fb29b0: Merge "Move mips/mips64 android_memset16/android_memset32 into libcutils."
* commit 'aaf25409b02f15c5f8f4e708d571a97f9ee4a346':
  Move mips/mips64 android_memset16/android_memset32 into libcutils.
2015-04-02 21:13:43 +00:00
Elliott Hughes aaf25409b0 am 84ab5563: am d8fb29b0: Merge "Move mips/mips64 android_memset16/android_memset32 into libcutils."
* commit '84ab55632a76d95a769ef3c62f401bb35276c47c':
  Move mips/mips64 android_memset16/android_memset32 into libcutils.
2015-04-02 20:53:54 +00:00
Elliott Hughes 84ab55632a am d8fb29b0: Merge "Move mips/mips64 android_memset16/android_memset32 into libcutils."
* commit 'd8fb29b0c09de25c416141a4bb150cc7db9f28ca':
  Move mips/mips64 android_memset16/android_memset32 into libcutils.
2015-04-02 20:43:22 +00:00
Elliott Hughes d8fb29b0c0 Merge "Move mips/mips64 android_memset16/android_memset32 into libcutils." 2015-04-02 20:35:20 +00:00
Elliott Hughes a492f3797a Move mips/mips64 android_memset16/android_memset32 into libcutils.
Change-Id: Ia826dd872f64cc80635f50525a0c393f43ae5204
2015-04-02 11:59:22 -07:00
Elliott Hughes d68c1de616 am 83da8a42: am 19d00adb: am 27a158be: Merge "toolbox: ioctl: fix signedness on ioctl_nr"
* commit '83da8a425177b9826e4253ca15371927b0c134a6':
  toolbox: ioctl: fix signedness on ioctl_nr
2015-04-02 17:59:46 +00:00
Elliott Hughes 83da8a4251 am 19d00adb: am 27a158be: Merge "toolbox: ioctl: fix signedness on ioctl_nr"
* commit '19d00adb2bcbf1a20d4c8d0e9d07651d0e959153':
  toolbox: ioctl: fix signedness on ioctl_nr
2015-04-02 17:40:39 +00:00
Elliott Hughes 19d00adb2b am 27a158be: Merge "toolbox: ioctl: fix signedness on ioctl_nr"
* commit '27a158befa90fd8fb965091510d9a3e9079b04f4':
  toolbox: ioctl: fix signedness on ioctl_nr
2015-04-02 17:30:39 +00:00
Elliott Hughes 27a158befa Merge "toolbox: ioctl: fix signedness on ioctl_nr" 2015-04-02 17:22:23 +00:00
Mark Salyzyn d5cd3778cd mkbootfs: move fs_config to libcutils
Bug: 19908228

Change-Id: Ic843b32f575825dc89cd9fa15dc0619bc397ce82
2015-04-02 10:19:43 -07:00
Jeff Sharkey 6a0f89eca3 Merge "Give SocketListener some FD_CLOEXEC." 2015-04-02 17:08:28 +00:00
Paul Lawrence b8bd76b7cb Merge "Revert "Revert "Adding e4crypt support""" 2015-04-02 14:49:25 +00:00
Brian Carlstrom 4761c2a0e5 am a6fa57d2: am 8c755dfe: am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy"
* commit 'a6fa57d23f8a322aab22efd03689826e4a107f64':
  Fix shared version of libcutils on the host to include strlcpy
2015-04-02 14:17:54 +00:00
Brian Carlstrom a6fa57d23f am 8c755dfe: am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy"
* commit '8c755dfe4c1a479fe5f64d1ea0c32be89268da87':
  Fix shared version of libcutils on the host to include strlcpy
2015-04-02 13:55:16 +00:00
Brian Carlstrom 8c755dfe4c am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy"
* commit 'c7cddffa14369265c82e5a08797f7ba687d174ef':
  Fix shared version of libcutils on the host to include strlcpy
2015-04-02 13:44:40 +00:00
Brian Carlstrom c7cddffa14 Merge "Fix shared version of libcutils on the host to include strlcpy" 2015-04-02 07:51:10 +00:00
Brian Carlstrom 60a347fc87 Fix shared version of libcutils on the host to include strlcpy
Change-Id: Ic727508d9cfadea0050d1ccc491ee61aac1ef55a
2015-04-02 00:43:45 -07:00
Jeff Sharkey 55fd316ea7 Give SocketListener some FD_CLOEXEC.
Sockets love FD_CLOEXEC.

Bug: 19993667
Change-Id: I0d72a27e0f46b79843bb91ed48ebaf1c89484fd2
2015-04-01 22:31:40 -07:00
Jeff Sharkey 70837dd4ac Merge "Different blkid and fsck execution domains." 2015-04-02 05:00:03 +00:00
Etan Cohen 542a49083f Merge "Merge commit 'a8cb3cd1601909ae04e14cd5ce42c286a8cf3ba4' into merge" 2015-04-02 03:08:17 +00:00