Merge commit 'f68d6af83f8f99714c139d867e8328f558480f28' into gingerbread-plus-aosp
* commit 'f68d6af83f8f99714c139d867e8328f558480f28':
ndk: Add a test to check that prebuilt libraries work as expected.
Merge commit 'eefb5c2dca087c2b0a0ef90e15db00fb5523d8af' into gingerbread-plus-aosp
* commit 'eefb5c2dca087c2b0a0ef90e15db00fb5523d8af':
Update native_activity sample to use new glue code.
The native_activity sample is now built with the new threaded_app
glue code, removing all of the boiler-plate code from it. This
adds the glue code (header and .a) to the NDK.
Change-Id: I2a7be473811f22f948dcda3da8034dd0bd62049d
Merge commit 'ec87ca5f3abb615d75ee68ad977b3a17c3c7d3ab' into gingerbread-plus-aosp
* commit 'ec87ca5f3abb615d75ee68ad977b3a17c3c7d3ab':
Add the support for the alarmManager and force the device to wake up.
Merge commit '34ca4b646b20cc209b06fec482e6c77dbc92d220' into gingerbread
* commit '34ca4b646b20cc209b06fec482e6c77dbc92d220':
Add the support for the alarmManager and force the device to wake up.
Merge commit 'd15a18bdd2762524d3aff505eea5bd7714b10a6c' into gingerbread-plus-aosp
* commit 'd15a18bdd2762524d3aff505eea5bd7714b10a6c':
Remove C++ headers from the platform directories.
Merge commit '2708f19ba33163b1ac0c5ea2758d0c09d97e8cc0' into gingerbread-plus-aosp
* commit '2708f19ba33163b1ac0c5ea2758d0c09d97e8cc0':
Update API level 9 sysroot to allow static C++ destructors to be called on dlclose().
We now rely instead on the content of $NDK/sources/cxx-stl/system/include
that is automatically used if a module has C++ sources.
Change-Id: I4319d9260fcf9fb31c59c2f21ca64b536725d4f5
Merge commit '02215b36dde381f0b48ba51bfea405f5a6b01e46' into gingerbread-plus-aosp
* commit '02215b36dde381f0b48ba51bfea405f5a6b01e46':
Update to use new looper API.
Very simple and dumb, but we now get touch events and fill the
window with a color (using OpenGL) based on its location.
Change-Id: I6657d2bb013570238bc0fe639f33c59f1ab68872
Merge commit '88510488e99d02e3b778ae530bb6e1e6aee3a226' into gingerbread-plus-aosp
* commit '88510488e99d02e3b778ae530bb6e1e6aee3a226':
Update native_activity sample code to use ANativeWindow.
Merge commit '24ff92954baf143c31f7f8e260b2202f96f0663a' into gingerbread-plus-aosp
* commit '24ff92954baf143c31f7f8e260b2202f96f0663a':
Add connectivity unit tests to test_defs.xml
Merge commit '21851dd54f9b70091e441cfb4a1dea661a3f6a0d' into gingerbread-plus-aosp
* commit '21851dd54f9b70091e441cfb4a1dea661a3f6a0d':
Update to new native activity APIs.
This introduces crtbegin_so.o and crtend_so.o and also requires a corresponding
change in the NDK build scripts to use them.
Also add a small test under 'tests/dlclose-destruction' to check that.
Note that this is not a sample (i.e. Android application) per se.
Change-Id: Icf25836363a3ed59310e579ce990aeca868e70e4
Merge commit '3bacdf93002237f35530c1e756481db429285a96' into gingerbread-plus-aosp
* commit '3bacdf93002237f35530c1e756481db429285a96':
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Merge commit '1a132581a5ce6188989d8522d227392c05cb42f6' into froyo-plus-aosp
* commit '1a132581a5ce6188989d8522d227392c05cb42f6':
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Merge commit '1a132581a5ce6188989d8522d227392c05cb42f6' into gingerbread
* commit '1a132581a5ce6188989d8522d227392c05cb42f6':
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Merge commit '9e1400cdae7f3732808120db8b83de7b252340ca' into gingerbread-plus-aosp
* commit '9e1400cdae7f3732808120db8b83de7b252340ca':
Do not compress resources.arsc in android.jar