Merge commit 'db7a7909599514d0337b04058d8aa1838129f111'
* commit 'db7a7909599514d0337b04058d8aa1838129f111':
Add support for parsing code coverage file path to runtest and related cleanup.
Merge commit 'd21c809912d1d38b73247b2b8184b8cca3f1ef88'
* commit 'd21c809912d1d38b73247b2b8184b8cca3f1ef88':
Expose <android/log.h> which contains the declaration of /system/lib/liblog.so.
This change is to adapt runtest to the InstrumentationTestRunner change which
dumps coverage data to the app's local data folder, instead of a fixed file on
the sdcard.
Also fixed adb_interace.StartInstrumentationForPackage, added better handling
when generating coverage for tests with unknown coverage targets, and reduced
the duplicate definitions of the "coverage_targets.xml" definition file.
Merge commit '055fcd23fb79638dc7d738f2951594b87256564a'
* commit '055fcd23fb79638dc7d738f2951594b87256564a':
Use bash instead of sh because of the '[[' command
Merge commit 'cb9c2eaac7f52defc2fcc70fc016876f4bbc0b9f'
* commit 'cb9c2eaac7f52defc2fcc70fc016876f4bbc0b9f':
Force the use of 32-bit toolchain binaries on 64-bit systems.
* 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).
Merge commit '5f563d066dd173bd307f5a33581ee325dcd1e81f'
* commit '5f563d066dd173bd307f5a33581ee325dcd1e81f':
Change build path to "packages/app/Camera.apk". So that it will also
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'
Merge commit 'ce803ae7b9162f92f43e64922b7d610e652ab468'
* commit 'ce803ae7b9162f92f43e64922b7d610e652ab468':
Update some class names in plugin.xml that were not updated by the refactoring.
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.
Merge commit '5ad70bbac751f41bbd27bc63968f47e8d4fd88b2'
* commit '5ad70bbac751f41bbd27bc63968f47e8d4fd88b2':
Fix the uninstall target in the Ant build script.
Merge commit 'af45b39d887ad4ec4a806d352009cdc28238f21f'
* commit 'af45b39d887ad4ec4a806d352009cdc28238f21f':
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.
