Commit Graph

1988 Commits

Author SHA1 Message Date
Dan Bornstein deb9188f4f It seems that Windows actually does have a header for <stdbool.h>.
Change-Id: I25d7846c066135f0af1fef2995bcb86397b23226
2010-09-01 17:03:43 -07:00
Dan Bornstein 556f09c426 am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.
Merge commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c' into gingerbread-plus-aosp

* commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c':
  It seems that Windows actually does have a header for <stdbool.h>.
2010-09-01 16:51:24 -07:00
Dan Bornstein f74af26d18 It seems that Windows actually does have a header for <stdbool.h>.
Change-Id: I443929d07972389a8c9837926a4b7df37bd6a16a
2010-09-01 16:21:09 -07:00
Jason Sams 54adc5e8a1 Remove ACC which has been replaced with llvm.
Free up space in build.

Change-Id: Ic5cc48bacca47b45809b9bc649ae5b629b7427ed
2010-09-01 12:33:06 -07:00
Nick Kralevich c34f195149 am 095a6a6e: am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
Merge commit '095a6a6ecb8039067c077db381bd02abc2496422'

* commit '095a6a6ecb8039067c077db381bd02abc2496422':
  get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
2010-08-31 17:50:15 -07:00
Nick Kralevich 095a6a6ecb am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread
Merge commit '739cd9d2d4718913889a15d95c840506a2af04d1' into gingerbread-plus-aosp

* commit '739cd9d2d4718913889a15d95c840506a2af04d1':
  get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
2010-08-31 17:47:49 -07:00
Nick Kralevich 739cd9d2d4 Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread 2010-08-31 17:45:04 -07:00
Nick Kralevich 4688ac5b73 get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
Change-Id: If365bd88f735d425f37d61bcd5a6903f99f6a454
2010-08-31 09:44:43 -07:00
Dmitry Shmidt 4358544a3f toolbox: top: Add processor field
Change-Id: I9f8e45a963a0773f27ddcd1d249aecac1ab9152e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-08-30 16:39:14 -07:00
Nick Kralevich cb020611f9 am c1858e5c: (-s ours) am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a from master branch
Merge commit 'c1858e5cefbd643737e978cbbca3f264d04d2d1b'

* commit 'c1858e5cefbd643737e978cbbca3f264d04d2d1b':
  do not merge: cherry-picked 44db990d3a from master branch
2010-08-30 14:37:03 -07:00
Nick Kralevich c1858e5cef am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a from master branch
Merge commit '81ff156bea2804d689fed98b076c2cea0928d752' into gingerbread-plus-aosp

* commit '81ff156bea2804d689fed98b076c2cea0928d752':
  do not merge: cherry-picked 44db990d3a from master branch
2010-08-30 14:32:54 -07:00
Nick Kralevich 81ff156bea am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a from master branch
Merge commit '2ad6067ce491446ab22f59a363d36575a942f5c7' into gingerbread

* commit '2ad6067ce491446ab22f59a363d36575a942f5c7':
  do not merge: cherry-picked 44db990d3a from master branch
2010-08-30 14:29:13 -07:00
Jean-Baptiste Queru 430185526b am bb1d8e42: resolved conflicts for merge of 9682e24b to gingerbread-plus-aosp
Merge commit 'bb1d8e42dddcc89422b7add4b250d016d332bba8'

* commit 'bb1d8e42dddcc89422b7add4b250d016d332bba8':
  libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic
2010-08-30 14:06:25 -07:00
Jean-Baptiste Queru bb1d8e42dd resolved conflicts for merge of 9682e24b to gingerbread-plus-aosp
Change-Id: I8cd7e43ee9689bc5c86ed0976536ef5235cbfd84
2010-08-30 13:56:48 -07:00
Jean-Baptiste Queru 9682e24bae Merge "libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic" 2010-08-30 13:29:43 -07:00
Nick Kralevich 2ad6067ce4 do not merge: cherry-picked 44db990d3a from master branch
Change-Id: I03e99bfa70ab86eb8eaa2984b6da26a92bd2718a
2010-08-30 10:28:11 -07:00
Nick Kralevich 9abea13a0a am 4692599c: am 44db990d: Fix bug 2950316. Check return values.
Merge commit '4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3'

* commit '4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3':
  Fix bug 2950316.  Check return values.
2010-08-27 18:10:24 -07:00
Nick Kralevich 4692599cf7 am 44db990d: Fix bug 2950316. Check return values.
Merge commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723' into gingerbread-plus-aosp

* commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723':
  Fix bug 2950316.  Check return values.
2010-08-27 15:28:24 -07:00
Iliyan Malchev bc4d60af3c Merge "Debuggerd now outputs the offset of libc.so on the device as a separate item." 2010-08-27 15:04:02 -07:00
Hristo Bojinov c031a3b006 Debuggerd now outputs the offset of libc.so on the device as a separate item.
Change-Id: I350c9ddb496a76d1ee897ae84893bf0e86abd45c
2010-08-27 14:58:07 -07:00
Nick Kralevich 44db990d3a Fix bug 2950316. Check return values.
Change-Id: I687bb5fb8195d4c1fc863e32a5e233a8b9e74196
2010-08-27 14:37:11 -07:00
Robert Greenwalt 50360b20c8 am 64a053b6: am 705ab8db: Fix sim build - remove unncesessary header.
Merge commit '64a053b67371595d2b541cd4f945fcec1fb8e9d2'

* commit '64a053b67371595d2b541cd4f945fcec1fb8e9d2':
  Fix sim build - remove unncesessary header.
2010-08-26 13:14:36 -07:00
Robert Greenwalt 64a053b673 am 705ab8db: Fix sim build - remove unncesessary header.
Merge commit '705ab8db827b0f7f3389463af67d173c8a94fc8a' into gingerbread-plus-aosp

* commit '705ab8db827b0f7f3389463af67d173c8a94fc8a':
  Fix sim build - remove unncesessary header.
2010-08-26 09:02:48 -07:00
Robert Greenwalt 705ab8db82 Fix sim build - remove unncesessary header.
Change-Id: Ibeba75848eaf732b7d0c7aecc9e7be8dbd509a1c
2010-08-25 11:21:36 -07:00
Jean-Baptiste Queru ec16e4fc3e am 41c3eed8: Manual merge
Merge commit '41c3eed8ab210530c1bebd284eb247cad2cd67b0'

* commit '41c3eed8ab210530c1bebd284eb247cad2cd67b0':
  Add mksh from CVS 2010/08/24 as system/core/mksh module
2010-08-25 10:00:11 -07:00
Jean-Baptiste Queru a2f3cb8ca4 am 468f23ac: Manual merge
Merge commit '468f23ac2fa3db150b6c626417de44f5c0f17fa0'

* commit '468f23ac2fa3db150b6c626417de44f5c0f17fa0':
  Build ash as ash with shell_ash tag; install sh symlink
  Copyright message changed
2010-08-25 09:59:59 -07:00
Jean-Baptiste Queru 3d092d0a89 am bdcf98dd: Manual merge
Merge commit 'bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df'

* commit 'bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df':
  Add API to add a route to IPv4/IPv6 host/gateway.
2010-08-25 09:59:50 -07:00
Szymon Jakubczak feb391d4be am 8c85a00d: - creates proper ifc.h and dhcp.h headers for libnetutils - adds ifc_set_hwaddr - adds hwaddr command to netcfg - code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing - consistency: use net.XXX.dnsX properties in favor of dhcp.XX
Merge commit '8c85a00db6da092ec3766facd49132fa4fc319a1'

* commit '8c85a00db6da092ec3766facd49132fa4fc319a1':
  - creates proper ifc.h and dhcp.h headers for libnetutils
2010-08-25 09:59:45 -07:00
Jean-Baptiste Queru 41c3eed8ab Manual merge
Change-Id: I91cabbae567a62e9000446c692175f729cbe67f4
2010-08-25 09:56:16 -07:00
Jean-Baptiste Queru 468f23ac2f Manual merge
Change-Id: I849703a709fe4bf9ea7181268221d9b648b2e73d
2010-08-25 09:54:23 -07:00
Jean-Baptiste Queru bdcf98ddbf Manual merge
Change-Id: Ic71ed9c392c5dee4a5a9be184d071eb688741f6f
2010-08-25 09:25:12 -07:00
Szymon Jakubczak 8c85a00db6 - creates proper ifc.h and dhcp.h headers for libnetutils
- adds ifc_set_hwaddr
- adds hwaddr command to netcfg
- code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing
- consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties
  (see related change to WifiStateTracker)
- updated system/core/nexus to use new headers, although not sure if
anybody still uses nexus

Change-Id: Idd70c0ac6e89b38e86816578c33eff805d30cac4
2010-08-25 08:13:42 -07:00
Maarten Hooft b8185d9108 am 2c72df99: am 65e461c4: Fix the pagesize argument parsing
Merge commit '2c72df998799738662a77cef3f522fdc6ae22fde'

* commit '2c72df998799738662a77cef3f522fdc6ae22fde':
  Fix the pagesize argument parsing
2010-08-24 17:56:25 -07:00
Maarten Hooft 2c72df9987 am 65e461c4: Fix the pagesize argument parsing
Merge commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad' into gingerbread-plus-aosp

* commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad':
  Fix the pagesize argument parsing
2010-08-24 15:30:04 -07:00
Maarten Hooft 65e461c478 Fix the pagesize argument parsing
Change-Id: I8a3d1a2a70c5ad972d3e150b320ee2184c9d5b4a
2010-08-24 15:24:50 -07:00
Ying Wang 50acaab0d6 am 0cd43305: am fc2f7cb6: Fix usage string.
Merge commit '0cd43305e9e12e0f2d622fe05286a2ed07fb2990'

* commit '0cd43305e9e12e0f2d622fe05286a2ed07fb2990':
  Fix usage string.
2010-08-24 11:21:22 -07:00
Thorsten Glaser ba2627c6cd Add mksh from CVS 2010/08/24 as system/core/mksh module
Both shells (ash from system/core/sh, and mksh) are built by
default but only the one where $(TARGET_SHELL) is set to is
actually installed (the shell and the mkshrc configuration
file are tagged shell_mksh for this to work).

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
2010-08-24 18:25:55 +02:00
Thorsten Glaser bdc36d641c Build ash as ash with shell_ash tag; install sh symlink
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
2010-08-24 18:23:40 +02:00
Jean-Baptiste Queru 69507eb065 Merge "Copyright message changed" 2010-08-23 18:40:03 -07:00
Ying Wang 0cd43305e9 am fc2f7cb6: Fix usage string.
Merge commit 'fc2f7cb69e3f15a616330a69f0675675c68112f3' into gingerbread-plus-aosp

* commit 'fc2f7cb69e3f15a616330a69f0675675c68112f3':
  Fix usage string.
2010-08-23 13:14:42 -07:00
Ying Wang fc2f7cb69e Fix usage string.
Change-Id: Iaa99a1bb8bb6998082f3553689b5b812a6471514
2010-08-23 12:59:23 -07:00
Jesse Wilson fa5a26885c am 2c9ea21d: am 7ab237f1: Including dl heap stubs for the dalvikvm host build
Merge commit '2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43'

* commit '2c9ea21de39cd4bd29bbcde81ba065dfb5e46f43':
  Including dl heap stubs for the dalvikvm host build
2010-08-21 09:36:09 -07:00
Mike Lockwood fc1a13bfdd sdcard: Add support for the O_TRUNC open() flag
BUG: 2935163

Change-Id: I9f76b24147b2f87ddb7869bb72baac03e86ef7e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-20 10:30:15 -04:00
Brian Swetland 97970b0be6 Merge "Support an additional alias for 'adb shell.'" 2010-08-19 10:49:18 -07:00
Dave Butcher ef18202fd1 Copyright message changed
Change requested by Android Open Source Project
2010-08-19 12:31:34 +01:00
Jesse Wilson 2c9ea21de3 am 7ab237f1: Including dl heap stubs for the dalvikvm host build
Merge commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda' into gingerbread-plus-aosp

* commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda':
  Including dl heap stubs for the dalvikvm host build
2010-08-18 22:58:42 -07:00
Daniel Sandler ff91ab855b Support an additional alias for 'adb shell.'
Change-Id: Ie8d667407fef8ee5a6c7ab86b30307fb61869170
2010-08-19 01:10:18 -04:00
Jesse Wilson 7ab237f1ef Including dl heap stubs for the dalvikvm host build
Change-Id: I9d0ce98d433f71db25c58bf464ec9317552cfae6
2010-08-18 21:23:13 -07:00
Dmitry Shmidt 021195ef97 Merge "ps: Add -c flag to show CPU number last executed on" 2010-08-18 17:37:39 -07:00
Dmitry Shmidt 8b37c91b93 ps: Add -c flag to show CPU number last executed on
Change-Id: I9a8faef0824c390ef980ce6c33e9c79102884879
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-08-18 17:26:26 -07:00