Commit Graph

15307 Commits

Author SHA1 Message Date
Jack Palevich
6516b6de9f am 055fcd23: Use bash instead of sh because of the \'[[\' command
Merge commit '055fcd23fb79638dc7d738f2951594b87256564a'

* commit '055fcd23fb79638dc7d738f2951594b87256564a':
  Use bash instead of sh because of the '[[' command
2009-05-28 15:13:52 -07:00
Jack Palevich
5d7100768a am dd3cf52f: Improve Linux 32-bit JVM detection logic.
Merge commit 'dd3cf52f6f598f72e2f165cc2a2ea9551d0e3cd4'

* commit 'dd3cf52f6f598f72e2f165cc2a2ea9551d0e3cd4':
  Improve Linux 32-bit JVM detection logic.
2009-05-28 15:13:51 -07:00
Jack Palevich
055fcd23fb Use bash instead of sh because of the '[[' command
The '[[' command is not guaranteed to be present in /bin/sh, and in fact
is missing in stock Ubuntu 8.04
2009-05-28 15:10:26 -07:00
Jack Palevich
dd3cf52f6f Improve Linux 32-bit JVM detection logic.
Now we detect if the JVM we are about to run is 32-bit or not,
rather than checking if the CPU is capable of executing 64-bit
code or not.
2009-05-28 15:09:59 -07:00
Android (Google) Code Review
f3eda08797 Merge change 2643
* changes:
  Use bash instead of sh because of the '[[' command
2009-05-28 14:54:16 -07:00
Jack Palevich
c73dabc0d7 Use bash instead of sh because of the '[[' command
The '[[' command is not guaranteed to be present in /bin/sh, and in fact
is missing in stock Ubuntu 8.04
2009-05-28 14:53:02 -07:00
Wei-Ta Chen
b515fb18c2 Add Skia's native tests to the master test definition file. 2009-05-28 14:20:27 -07:00
Android (Google) Code Review
f2a6d4a368 Merge change 2592
* changes:
  Improve Linux 32-bit JVM detection logic.
2009-05-28 13:14:18 -07:00
Android (Google) Code Review
c8fe9b7173 am cb9c2eaa: Merge change 2524 into donut
Merge commit 'cb9c2eaac7f52defc2fcc70fc016876f4bbc0b9f'

* commit 'cb9c2eaac7f52defc2fcc70fc016876f4bbc0b9f':
  Force the use of 32-bit toolchain binaries on 64-bit systems.
2009-05-28 12:31:32 -07:00
Android (Google) Code Review
d86cec9e99 Merge change 2573
* changes:
  Sim-only files move, part 1/2.
2009-05-28 11:13:13 -07:00
Android (Google) Code Review
cb9c2eaac7 Merge change 2524 into donut
* changes:
  Force the use of 32-bit toolchain binaries on 64-bit systems. This is used to reduce the number of distributable prebuilt packages (i.e. linux-x86_64 is not needed anymore).
2009-05-28 08:58:35 -07:00
Android (Google) Code Review
c83a2e9855 Merge change 2456
* changes:
  add tests for new pause/resume events
2009-05-28 06:42:06 -07:00
Jack Palevich
5715029663 Improve Linux 32-bit JVM detection logic.
Now we detect if the JVM we are about to run is 32-bit or not,
rather than checking if the CPU is capable of executing 64-bit
code or not.
2009-05-27 18:06:52 -07:00
Andy McFadden
5cd6406e7a Sim-only files move, part 1/2.
Move Pipe and executablepath from libutils to the simulator, since nothing
else uses them.
2009-05-27 16:01:13 -07:00
Raphael
2e46d39eb8 SDK Updater stuff. 2009-05-27 11:12:31 -07:00
Owen Lin
e4c2d52998 am 5f563d06: Change build path to "packages/app/Camera.apk". So that it will also build the application code.
Merge commit '5f563d066dd173bd307f5a33581ee325dcd1e81f'

* commit '5f563d066dd173bd307f5a33581ee325dcd1e81f':
  Change build path to "packages/app/Camera.apk". So that it will also
2009-05-27 11:01:15 -07:00
Owen Lin
5f563d066d Change build path to "packages/app/Camera.apk". So that it will also
build the application code.
2009-05-27 10:19:02 -07:00
David 'Digit' Turner
5ad95c577a Force the use of 32-bit toolchain binaries on 64-bit systems.
This is used to reduce the number of distributable prebuilt packages
(i.e. linux-x86_64 is not needed anymore).

Also fix build/tools/build-toolchain.sh to properly copy the GPL and LGPL
license files into the generated prebuilt packages.

Also add a .gitignore files to get less spew from 'git status'
2009-05-27 16:04:25 +02:00
Android (Google) Code Review
90dabc9120 am e0fbae30: Merge change 2472 into donut
Merge commit 'e0fbae303c71b1be68e581e9b686e8a0104e657f'

* commit 'e0fbae303c71b1be68e581e9b686e8a0104e657f':
  ADT #1877529: Fixes a couple potential NPEs in content assists.
2009-05-26 15:29:13 -07:00
Android (Google) Code Review
e0fbae303c Merge change 2472 into donut
* changes:
  ADT #1877529: Fixes a couple potential NPEs in content assists.
2009-05-26 15:26:00 -07:00
Xavier Ducrohet
feb725e826 am ce803ae7: Update some class names in plugin.xml that were not updated by the refactoring.
Merge commit 'ce803ae7b9162f92f43e64922b7d610e652ab468'

* commit 'ce803ae7b9162f92f43e64922b7d610e652ab468':
  Update some class names in plugin.xml that were not updated by the refactoring.
2009-05-26 15:17:30 -07:00
Xavier Ducrohet
ce803ae7b9 Update some class names in plugin.xml that were not updated by the refactoring. 2009-05-26 15:09:02 -07:00
Raphael
6235bff51d ADT #1877529: Fixes a couple potential NPEs in content assists.
Can't reproduce the NPE in ContentAssist listed in the
bug. However if things go really wrong there are a couple
objects that can be null so let's be defensive about them.
2009-05-26 15:08:33 -07:00
Xavier Ducrohet
d236e04066 am ca2281d8: Fix wrong path to externalized string file.
Merge commit 'ca2281d885ffcc3f6fb719901d373d9cb192e3f2'

* commit 'ca2281d885ffcc3f6fb719901d373d9cb192e3f2':
  Fix wrong path to externalized string file.
2009-05-26 13:52:05 -07:00
Xavier Ducrohet
ca2281d885 Fix wrong path to externalized string file.
This is from the big refactoring that moved everything into internal.
2009-05-26 13:44:02 -07:00
Android (Google) Code Review
71eaf34b36 am 5ad70bba: Merge change 2447 into donut
Merge commit '5ad70bbac751f41bbd27bc63968f47e8d4fd88b2'

* commit '5ad70bbac751f41bbd27bc63968f47e8d4fd88b2':
  Fix the uninstall target in the Ant build script.
2009-05-26 13:42:15 -07:00
David 'Digit' Turner
8b1f3cf2f7 am 8b057ed6: Fix bad qemud crash on emulator startup.
Merge commit '8b057ed6f6ec4e9eb829b230d6f2d35eaef8658e'

* commit '8b057ed6f6ec4e9eb829b230d6f2d35eaef8658e':
  Fix bad qemud crash on emulator startup.
2009-05-26 13:42:13 -07:00
Mike Reed
1e7c3319b3 add tests for new pause/resume events 2009-05-26 16:37:45 -04:00
Android (Google) Code Review
5ad70bbac7 Merge change 2447 into donut
* changes:
  Fix the uninstall target in the Ant build script.
2009-05-26 13:25:29 -07:00
David 'Digit' Turner
8b057ed6f6 Fix bad qemud crash on emulator startup. 2009-05-26 22:21:28 +02:00
Xavier Ducrohet
55b0512f2b Fix the uninstall target in the Ant build script.
the uninstall parameter is a value (the application package), but the Ant
task was incorrectly using "path" for the argument.
2009-05-26 12:25:28 -07:00
Android (Google) Code Review
f1dc697a8d am 6a95ff23: Merge change 2388 into donut
Merge commit '6a95ff237b00d6da0fecd4c0d3ecfa999a2107db'

* commit '6a95ff237b00d6da0fecd4c0d3ecfa999a2107db':
  Update Eclipse classpath file to add the android.tts package (path to package + files generated from AIDL).
2009-05-26 10:11:49 -07:00
David 'Digit' Turner
de081ffb7e am af45b39d: This adds a new helper program (qemu-props) to support the emulated system.
Merge commit 'af45b39d887ad4ec4a806d352009cdc28238f21f'

* commit 'af45b39d887ad4ec4a806d352009cdc28238f21f':
  This adds a new helper program (qemu-props) to support the emulated system.
2009-05-26 10:11:16 -07:00
Android (Google) Code Review
6a95ff237b Merge change 2388 into donut
* changes:
  Update Eclipse classpath file to add the android.tts package (path to package + files generated from AIDL).
2009-05-26 10:05:33 -07:00
David 'Digit' Turner
af45b39d88 This adds a new helper program (qemu-props) to support the emulated system.
Its purpose is to contact the 'boot-properties' service during the
boot process and to set the list of system properties read from the
emulator program through it.

It must be launched from /system/etc/init.goldfish.rc as root.

It depends on the 'boot-properties' service being implemented by the
emulator (in a later patch). If not available, it will simply timeout.

This also fixes a potential crash in qemud which can happen in the following case:

- client sends a command to a service
- the service responds with one or more message
- the service immediately closes the connection before the client can read the data

what happened is that the FDHandler object was buffering out-going packets to the
client, but the Multiplexer acted on the disconnection immediately. This resulted
in:

- client_free() being called
-   fdhandler_shutdown() being called
-     the FDHandler being placed on the 'closing' list to be able to send
      buffered packets later. And 'receiver_close' being called
-       client_fd_close() being called, which would call client_free()
        recursively
-         the second client_free() call would free the object
-  the first client_free() call would try to free the object again
-  ==> dlmalloc() detects a double-free and immediately aborts.

the fixes simply avoids the calle to receiver_close() in fdhandler_shutdown()
since this function is called from an explicit shutdown request from the multiplexer,
it doesn't correspond to the case where the client has closed the connection itself.
2009-05-26 17:07:25 +02:00
Ken Shirriff
0b10c8f9ca Fix misleading comment.
ExpatParser defaults to UTF-8 if no encoding is specified.
2009-05-25 17:44:47 -07:00
Android (Google) Code Review
66a167bfe5 am 3a39e9c9: Merge change 2078 into donut
Merge commit '3a39e9c90b34cbdfa17b6bc2928b448e92204ccc'

* commit '3a39e9c90b34cbdfa17b6bc2928b448e92204ccc':
  Add simple change log to the NDK documentation.
2009-05-25 08:36:50 -07:00
Android (Google) Code Review
7eadac14ef am 8c093d5d: Merge change 2085 into donut
Merge commit '8c093d5d2a6695cda888827a506633da922ad543'

* commit '8c093d5d2a6695cda888827a506633da922ad543':
  This fixes the build to always define the ANDROID macro, and remove an empty -I from the compiler options.
2009-05-25 08:36:22 -07:00
Android (Google) Code Review
3a39e9c90b Merge change 2078 into donut
* changes:
  Add simple change log to the NDK documentation.
2009-05-25 02:56:37 -07:00
Android (Google) Code Review
8c093d5d2a Merge change 2085 into donut
* changes:
  This fixes the build to always define the ANDROID macro, and remove an empty -I from the compiler options.
2009-05-25 02:10:35 -07:00
Android (Google) Code Review
6116bf2245 am ceada119: Merge change 2320 into donut
Merge commit 'ceada119d3676a936988cb4b35f75ebf2c28b8ee'

* commit 'ceada119d3676a936988cb4b35f75ebf2c28b8ee':
  Sensors: Use a native_handle for the data channel instead of a single file descriptor.
2009-05-23 10:36:43 -07:00
Android (Google) Code Review
ceada119d3 Merge change 2320 into donut
* changes:
  Sensors: Use a native_handle for the data channel instead of a single file descriptor.
2009-05-23 10:35:12 -07:00
Jean-Michel Trivi
04502c6e43 Update Eclipse classpath file to add the android.tts package (path to package + files generated from AIDL). 2009-05-22 17:58:23 -07:00
Android (Google) Code Review
41185f0de4 am 3276b8e8: Merge change 2384 into donut
Merge commit '3276b8e868bb771d2a0bfcc2c83fae65cae172c7'

* commit '3276b8e868bb771d2a0bfcc2c83fae65cae172c7':
  SDK Updater: display properties of sources and packages.
2009-05-22 17:22:20 -07:00
Android (Google) Code Review
3276b8e868 Merge change 2384 into donut
* changes:
  SDK Updater: display properties of sources and packages.
2009-05-22 17:20:35 -07:00
Android (Google) Code Review
f741c51a1f am ab78aebc: Merge change 2348 into donut
Merge commit 'ab78aebc241d91b4afdc546c40c90e5114c41667'

* commit 'ab78aebc241d91b4afdc546c40c90e5114c41667':
  Fix typo in comment.
2009-05-22 17:05:28 -07:00
Android (Google) Code Review
ab78aebc24 Merge change 2348 into donut
* changes:
  Fix typo in comment.
2009-05-22 17:03:47 -07:00
Raphael
f864c1bf93 SDK Updater: display properties of sources and packages. 2009-05-22 16:51:51 -07:00
Xavier Ducrohet
be2241e2b7 am dc10c2e5: Update \'android update adb\' to the new file format for 3rd USB Vendor IDs.
Merge commit 'dc10c2e5a388f22fd0e061521dac61b6751b23f4'

* commit 'dc10c2e5a388f22fd0e061521dac61b6751b23f4':
  Update 'android update adb' to the new file format for 3rd USB Vendor IDs.
2009-05-22 16:04:13 -07:00
Xavier Ducrohet
dc10c2e5a3 Update 'android update adb' to the new file format for 3rd USB Vendor IDs.
The new file format is simply 1 ID per line, no need for a count value.
Lines starting with '#' are comments and therefore ignored.
2009-05-22 15:47:13 -07:00