Commit Graph

4609 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
dede009a98 Delete browserplugin sample. do not merge
It doesn't build in all environments.

Change-Id: Ib27b73a0f74a79e4138bb128f643206e37f5ea60
2011-01-27 13:35:26 -08:00
Jean-Baptiste Queru
475bb357db Merge "Current files for source.android.com" 2011-01-26 08:23:47 -08:00
Jean-Baptiste Queru
a6db53f077 Current files for source.android.com
This matches the current state of the live site.

Change-Id: If209bc337d31cf8669e2afb78c9b52e5bbe3cdac
2011-01-25 15:16:28 -08:00
David Turner
dfb9123d75 Merge "Use __asm__ instead of asm in public libc headers" 2011-01-25 08:49:13 -08:00
Jean-Baptiste Queru
a8d817c9fc Merge "source.android.com documentation cleanup" 2011-01-24 15:13:08 -08:00
Dianne Hackborn
e635484562 Merge "Monkey: request am to show the ANR dialog" 2011-01-22 11:36:43 -08:00
Vairavan Srinivasan
af5e575643 Monkey: request am to show the ANR dialog
Default return value of 1 from appNotResponding was to show the
ANR dialog in eclair. However, recent version of android's am
interpret 1 as to wait. Fix is to change the default return
value from 1 to 0.

Change-Id: I6620ef54309f1d30ef18a2b60d73b346c2446f93
2011-01-21 18:00:52 -08:00
Skyler Kaufman
f7ac2a3517 source.android.com documentation cleanup
Download and build instructions for AOSP updated from stone age to
Gingerbread era.

Change-Id: Ic7eff1618bafa182d411c0f02efe1acfbe83724c
2011-01-19 09:38:33 -08:00
Skyler Kaufman
e2a6258c42 Merge "A tiny http server to test source.android.com changes" 2011-01-19 09:34:34 -08:00
Jean-Baptiste Queru
99bc9c3144 A tiny http server to test source.android.com changes
Change-Id: I30be7674c0417a111eceef1ed10568a864217773
2011-01-14 09:13:33 -08:00
Xavier Ducrohet
dde7492d4b Merge "Move emulator skins to development.git" 2011-01-06 14:17:30 -08:00
Xavier Ducrohet
f0e5e93307 Move emulator skins to development.git
Also added new default RAM config to the skins.

Change-Id: Ib786287b43f639c6ae80bf109ac4fe5b12635676
2011-01-06 13:31:24 -08:00
Raphael Moll
1bf9f6936e Merge "Use OUT_DIR in atree to find android.jar" 2011-01-05 15:35:32 -08:00
Raphael Moll
c2e8083255 Use OUT_DIR in atree to find android.jar
Depends on change Iabbe9053 from build/core.

Change-Id: I0b6e29a5282c2ca6ff329981e5f8d2c677e6e84b
2011-01-05 14:59:27 -08:00
Martin Storsjo
80736a1bca Use __asm__ instead of asm in public libc headers
If compiling userland code with -std=c99, the current header produces an
error. The content of this header originally is a kernel internal header,
where asm() is acceptable. In a header visible to userland, this should be
__asm__ instead.

This change is done for all newly extracted headers by the extraction
script, by https://review.source.android.com/19406, which was recently
merged.

Change-Id: I69332124a56577673a14e84cd7d9a4462c307724
2010-12-28 21:47:03 +01:00
Raphael Moll
43a1de66a5 am 8b70d301: Merge "USB Driver INF file for rev 4."
* commit '8b70d30188f0dc42040643c13135f60c3294eae4':
  USB Driver INF file for rev 4.
2010-12-08 15:21:01 -08:00
Raphael Moll
8b70d30188 Merge "USB Driver INF file for rev 4." 2010-12-08 15:12:10 -08:00
Xavier Ducrohet
088edcdade am a2ba6854: Merge "Specific instructions about using these Eclipse settings."
* commit 'a2ba68544f715bb9043703e33de29ead328fe0f7':
  Specific instructions about using these Eclipse settings.
2010-12-07 15:29:52 -08:00
Xavier Ducrohet
a2ba68544f Merge "Specific instructions about using these Eclipse settings." 2010-12-07 15:16:52 -08:00
Tim Baverstock
179141a278 Specific instructions about using these Eclipse settings.
Change-Id: I0ca386f58988b3e8f3c518438da79af0ffdf0776
2010-12-07 15:04:45 +00:00
Raphael Moll
735f6a949c USB Driver INF file for rev 4.
Change-Id: I6235db54e20557231dffe7924fafb5ce72654a06
2010-12-06 16:21:25 -08:00
Jean-Baptiste Queru
0e5e799676 Merge from open-source master
Change-Id: Icc569e311600504c75304c79fa878614ac597fba
2010-12-02 07:46:47 -08:00
Raphael Moll
85aa83ea1f Merge "Remove obsolete USB Driver "legacy" sources & files." 2010-12-01 13:22:40 -08:00
Raphael Moll
d0041b0e9c Remove obsolete USB Driver "legacy" sources & files.
Change-Id: I4357c1417e6472395b803b799f43aae18f845be9
2010-12-01 12:51:15 -08:00
Roman Nurik
624ae678ef am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread
* commit '14789d1eab905728da4f6995816c80716caf52f4':
  Add NFCDemo to sdk.atree
2010-11-29 15:54:07 -08:00
Anirudh Dewani
35dfdb6fc3 am dbe66332: Extended camera preview to switch between multiple available device cameras
* commit 'dbe66332e278962c058a596353b839a2fd6dca1b':
  Extended camera preview to switch between multiple available device cameras
2010-11-29 15:54:05 -08:00
Roman Nurik
14789d1eab Merge "Add NFCDemo to sdk.atree" into gingerbread 2010-11-29 15:52:21 -08:00
Roman Nurik
9488e4296e Add NFCDemo to sdk.atree
Change-Id: I2e0a330a31d6d3c0b8c70c38af60118461e7e403
2010-11-29 15:45:50 -08:00
Anirudh Dewani
dbe66332e2 Extended camera preview to switch between multiple available device cameras
Change-Id: I8e97d6182bf02cba29ae3bc9f1a7ef21a277117e
2010-11-26 02:28:11 +05:30
Jean-Baptiste Queru
cd26dbdbb4 am 72cb8dd1: Merge "Updated Android build instructions to mention envsetup.sh and lunch."
* commit '72cb8dd12c3aa6504fb5db31bf14d31d34db0d71':
  Updated Android build instructions to mention envsetup.sh and lunch.
2010-11-24 13:49:40 -08:00
Jean-Baptiste Queru
72cb8dd12c Merge "Updated Android build instructions to mention envsetup.sh and lunch." 2010-11-24 13:38:32 -08:00
Sascha Brawer
dea64b9b19 Updated Android build instructions to mention envsetup.sh and lunch.
Change-Id: I3922953766a2162c27d80630736e074a2b3dfb95
2010-11-24 15:37:47 +01:00
David 'Digit' Turner
fd49f509e8 am 1e7011fc: ndk: Add auto-generated <android/api-level.h>
* commit '1e7011fcd5eee3190b436881af33cd9715eb8d36':
  ndk: Add auto-generated <android/api-level.h>
2010-11-23 22:53:01 -08:00
Raphael
a65f76962f resolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp
Change-Id: I670002d7f8606f22c438057883e1a4a9fe63ebf6
2010-11-23 15:36:17 -08:00
Raphael Moll
f0f624f37b Merge "Win SDK: Split the win-sdk makefile and script into 2 parts." 2010-11-23 14:35:05 -08:00
Raphael
0aa3856227 resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp
Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9
2010-11-23 02:44:59 -08:00
Raphael Moll
d7267fc295 Merge "Move <uses-sdk> before <application> in samples." 2010-11-22 21:26:57 -08:00
Raphael Moll
1fe58f3892 Win SDK: Split the win-sdk makefile and script into 2 parts.
The main makefile+scripts to build the Windows SDK is still this
one here in development/build/tools. However it defers to a new
matching set of files in sdk/build to build and package
things that depend on the sdk.git or external/qemu.git.

This will make it easier for us to prepare SDKs based on
a tools_rN branch that isn't cut at the same time than the
platform branch.

This is a multi-part changeset. The other part is in sdk.git.

This change also definitely removes support for building
the Windows SDK under Cygwin. Only building a specific subset
of individual binaries is supported at this point.

Change-Id: I4e9a2d810cf29fae0097fbd92be0cef89c9b3505
2010-11-22 21:12:44 -08:00
David 'Digit' Turner
1e7011fcd5 ndk: Add auto-generated <android/api-level.h>
See ndk.git/build/tools/dev-generate-api-levels.sh

Change-Id: Id64e565e7da6bf23f4bfa0fca52a06dbfe843c37
2010-11-22 22:38:57 +01:00
Raphael Moll
a3dc674543 Move <uses-sdk> before <application> in samples.
Change-Id: Iac2644d350235e19f5109aeb25a8d6d4eb1af3fe
2010-11-22 12:39:47 -08:00
Glenn Kasten
6e20b04ed0 am f328f262: Merge "Remove .classpath and .project files" into gingerbread
* commit 'f328f262fd66f90a8ebda011e75dfcc11b65279a':
  Remove .classpath and .project files
2010-11-15 16:25:58 -08:00
Glenn Kasten
f328f262fd Merge "Remove .classpath and .project files" into gingerbread 2010-11-15 16:23:34 -08:00
Megha Joshi
d53c6f2ac3 am 7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread
* commit '7f39ff802b6281b563f341dc89c58a43ec6bdd99':
  NFC sample app  (DO NOT MERGE)
2010-11-12 18:32:14 -08:00
Megha Joshi
7f39ff802b Merge "NFC sample app (DO NOT MERGE)" into gingerbread 2010-11-12 18:30:14 -08:00
Megha Joshi
150dd1693f NFC sample app (DO NOT MERGE)
Change-Id: I1d1d67bbc6760cea1a0c6eccfa4d9f7b1398cd4d
2010-11-12 18:03:05 -08:00
Glenn Kasten
296326baa9 am 809ec924: Native audio example
* commit '809ec924d28657e8be8ca36871ce6ddbfedcdc40':
  Native audio example
2010-11-08 12:13:19 -08:00
Raphael Moll
4e75b80a4d am 4bd402f5: Merge "Fix DOS end-of-lines in winusb INF file."
* commit '4bd402f5f1f15a7e9f13ae0104d32285113d780b':
  Fix DOS end-of-lines in winusb INF file.
2010-11-08 10:13:55 -08:00
Raphael Moll
4bd402f5f1 Merge "Fix DOS end-of-lines in winusb INF file." 2010-11-08 10:02:03 -08:00
Glenn Kasten
809ec924d2 Native audio example
Change-Id: Ia48597d3e94d178ec95a396c545e4a95de7c88f8
2010-11-05 17:38:11 -07:00
Raphael Moll
66980b1877 Fix DOS end-of-lines in winusb INF file.
The file has a mix of unix and DOS-mode end-of-lines.
This CL just fixes the end-of-line to make it a consistent DOS-mode.
There is no change to the actualy content.

Change-Id: I6635ec87907f68e1d34c807f712723804eb0e698
2010-11-05 16:35:01 -07:00