منصة شليله

Fork

Merge branch 'cupcake'

auto import from //branches/cupcake/...@126645

auto import from //branches/cupcake/...@125939

auto import from //branches/cupcake/...@125939

Merge commit 'remotes/korg/cupcake'

Conflicts:
build/sdk.atree
ide/eclipse/.classpath
tools/activitycreator/src/com/android/activitycreator/ActivityCreator.java
tools/eclipse/scripts/create_adt_symlinks.sh
tools/eclipse/scripts/create_all_symlinks.sh
tools/eclipse/scripts/create_bridge_symlinks.sh
tools/eclipse/scripts/create_common_symlinks.sh
tools/eclipse/scripts/create_ddms_symlinks.sh
tools/eclipse/scripts/create_editors_symlinks.sh
tools/eclipse/scripts/create_test_symlinks.sh
tools/scripts/build.template

Code drop from //branches/cupcake/...@124589

Update the Eclipse plugin README with new instructions on how to compile the plug-ins.

Fix create_ddms_symlinks to create libs/ correctly.

Add git ignore files to avoid all build files from being submitted to git.

Fix eclipse setup scripts.
The fix will work for Linux and Mac, however for Windows the DDMS icons will have an invalid path.
I can address the Windows DDMS issue in a next CL if necessary by merging in a different
CL from upstream.

ENHANCEMENT: activitycreator generates 'tests' project for instrumentation.

activitycreator script is enhanced to generate 'tests' project along with the main project. The current behavior of generating Activity is extended by generating ActivityTest in 'tests/src' folder. The 'tests' folder follows the example provided asis in 'ApiDemos'. ApiDemos was used as reference project to mimic the project layout for building tests using Instrumentation.

From 'tests' project, type:
"adb shell am instrument -w [your.package].tests/android.test.InstrumentationTestRunner"
to run all tests using Android InstrumentationTestRunner.

NOTE: 'tests' is a separate AndroidProject by all means. It has its own AndroidManifest.xml, build.xml, src, res etc.,

AMEND:
Fixed style issues, javadoc
Fixed build.template to generate tests/build.xml
Removed build.tests.template since its obsolete now.

Changed srcdir="." to srcdir="${srcdir}" in scripts/build.template

This change makes sure the srcdir is pointing to only the java source folder and not recursively compile all source folders under the current folder. This is useful in having multiple java source folders for main, tests etc., Only the compile target is being affected by this change.

NOTE: Now you can have project/tests and work with tests as a separate android project, only for testing. In any case pointing to source explicitly makes sure no side affects arise by recursive compiling.

changed main class name in manifest file to correct one

Merge

Evan JIANG: Fix build bug when "make sdk"
If you run "make sdk" under the root path, there would be an error:
development/build/sdk.atree:122: couldn't locate source file:
development/emulator/prebuilt/android-arm/kernel-qemu
make: *** [out/host/darwin-x86/sdk/android-sdk_eng.Evan_mac-x86.zip]
Error 44

I guess the kernel-qemu path is wrong in the sdk.atree file.
With this patch, "make sdk" works ok.

Updated .classpath to use with Eclipse IDE.

Add a few missing headers

Fixes build with gcc 4.3.2 on Debian.

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>

Initial Contribution