OSDN Git Service
Christian Mehlmauer [Sun, 16 May 2010 20:46:34 +0000 (22:46 +0200)]
Removed Duplicate Build Paths
Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
Johan Alfven [Tue, 11 May 2010 07:05:28 +0000 (09:05 +0200)]
Added missing --pct-syskeys to processOptions in Monkey
According to the developer guidelines
http://developer.android.com/guide/developing/tools/monkey.html
it should be possible to run monkey with option --pct-syskeys <percent>
to adjust percentage of "system" key events. (These are keys that are
generally reserved for use by the system, such as Home, Back,
Start Call, End Call, or Volume controls.) However, when trying
to run monkey with that option it fails with:
** Error: Unknown option: --pct-syskeys
The function processOptions in file Monkey.java was missing the
option --pct-syskeys.
Change-Id: I5d328fc93dfe67ed7a905735d6762c7f91c69838
Xavier Ducrohet [Wed, 5 May 2010 21:13:49 +0000 (14:13 -0700)]
Update sdk.atree with new ant rules location.
Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9
Jean-Baptiste Queru [Mon, 3 May 2010 19:38:07 +0000 (12:38 -0700)]
Adapt to new location of libcore
Change-Id: I82b330562b4f0d2024e4fbe8235250abb029470c
Xavier Ducrohet [Tue, 27 Apr 2010 23:05:41 +0000 (16:05 -0700)]
Package Ant rules r3
Change-Id: I2c5fca2ac89a54499f243670bbe858affa8770c3
Raphael Moll [Sun, 18 Apr 2010 07:04:01 +0000 (00:04 -0700)]
Update the docs explaining how to build an SDK.
Change-Id: Ibb2ddb751ac6779b6bbbbcf4cb610d4d86280fee
Xavier Ducrohet [Fri, 16 Apr 2010 00:26:58 +0000 (17:26 -0700)]
Fix instructions on how to build the doc.
Change-Id: Id9cde46b38a74f0f6ee368fdc43aee8ec6082b5f
Xavier Ducrohet [Fri, 9 Apr 2010 21:11:16 +0000 (14:11 -0700)]
Merge "Fix SDK build by packaging the new Ant rules files."
Xavier Ducrohet [Fri, 9 Apr 2010 21:00:34 +0000 (14:00 -0700)]
Fix SDK build by packaging the new Ant rules files.
Change-Id: Id88eeb0e596b58e48f425c7521fb40f9e046b818
The Android Open Source Project [Fri, 9 Apr 2010 20:52:58 +0000 (13:52 -0700)]
Delete NDK, moved into its own project
Change-Id: Ia51e76d7a9995fb43a096ebbdfa908f84d9da59c
Xavier Ducrohet [Fri, 9 Apr 2010 20:14:58 +0000 (13:14 -0700)]
Update SDK build file to package the correct version for groovy.
Change-Id: I0e81a9941693acc0f29933aa15bb7d4e7689bf51
The Android Open Source Project [Tue, 30 Mar 2010 18:15:02 +0000 (11:15 -0700)]
merge from open-source master
Change-Id: I7ef151320d924b2b258163d8aabf5eeebffecd39
David 'Digit' Turner [Mon, 29 Mar 2010 21:36:26 +0000 (14:36 -0700)]
Use the 'master' branch to download toolchain sources by default.
The 'eclair' branch cannot be built with the current version of build-toolchain.sh
(More precisely, gdbserver link fails without a patch that is in master but not eclair).
Change-Id: Ib7d4f058d88afbfce6fb22fe1c5b6f08925c9ae3
David 'Digit' Turner [Sat, 27 Mar 2010 01:10:33 +0000 (18:10 -0700)]
build-toolchain.sh: fix the --force-build option
Change-Id: Ia171eff5bc4c352b1d9c646f133c69a77ff6681a
David 'Digit' Turner [Sat, 27 Mar 2010 00:48:46 +0000 (17:48 -0700)]
Allow toolchain source patching in build-toolchain.sh
This is going to make patching/debugging the toolchain sources
a lot easier.
Change-Id: I54f2fcb42465f9f5b1f3735bda1ce9d43eb96a64
Bruce Beare [Wed, 10 Mar 2010 23:37:03 +0000 (15:37 -0800)]
NDK can now build JNI code for IA
Change-Id: I5c03c2680663a4fefc4b22524088a3489132e74f
David Turner [Fri, 26 Mar 2010 20:11:06 +0000 (13:11 -0700)]
Merge "Port NDK build tools to IA"
Bruce Beare [Thu, 11 Mar 2010 19:14:29 +0000 (11:14 -0800)]
Port NDK build tools to IA
Change-Id: I4788cafb998b79234e7fb16661bb225680d5566c
The Android Open Source Project [Fri, 19 Mar 2010 23:36:04 +0000 (16:36 -0700)]
merge from open-source master
Change-Id: I4489db828e47c7c1987cd5cb768009eeb0a124b7
David 'Digit' Turner [Fri, 19 Mar 2010 18:25:48 +0000 (11:25 -0700)]
Merge "Add missing headers to the x86 android-5 headers (GLES/GLES2/log)"
David 'Digit' Turner [Fri, 19 Mar 2010 01:00:31 +0000 (18:00 -0700)]
Remove problematic headers from x86 android-5 headers.
These files have the same case-insensitive name, and this creates problems
when used on Windows + Cygwin.
Change-Id: I911906c209ad9fca8752ba4cdc9c65abdd0bd4a9
David 'Digit' Turner [Fri, 19 Mar 2010 00:45:15 +0000 (17:45 -0700)]
Add missing headers to the x86 android-5 headers (GLES/GLES2/log)
Change-Id: I0e066a1256d6a23b65672327c0cfcf67a0f03f1b
David Turner [Wed, 17 Mar 2010 21:30:53 +0000 (14:30 -0700)]
Merge "android-5 platform files for IA"
Bruce Beare [Wed, 10 Mar 2010 22:40:06 +0000 (14:40 -0800)]
android-5 platform files for IA
Change-Id: Id785125438abfd4dbc795f358ec223bf22c73fc1
Bruce Beare [Wed, 10 Mar 2010 22:40:06 +0000 (14:40 -0800)]
android-5 platform files for IA
Change-Id: Id785125438abfd4dbc795f358ec223bf22c73fc1
David 'Digit' Turner [Tue, 23 Feb 2010 00:35:29 +0000 (16:35 -0800)]
am
4653cb89: cpufeatures license is BSD, no Apache 2.0
Merge commit '
4653cb897b8f52c1ead12a1bffa1ba40fd8f45a2' into eclair-plus-aosp
* commit '
4653cb897b8f52c1ead12a1bffa1ba40fd8f45a2':
cpufeatures license is BSD, no Apache 2.0
David 'Digit' Turner [Tue, 23 Feb 2010 00:23:24 +0000 (16:23 -0800)]
cpufeatures license is BSD, no Apache 2.0
David 'Digit' Turner [Mon, 22 Feb 2010 22:18:36 +0000 (14:18 -0800)]
am
693ad65e: Add missing copyright disclaimers to cpufeatures and hello-neon
Merge commit '
693ad65e24cefe3d60d3702e6adab13d18b121ba' into eclair-plus-aosp
* commit '
693ad65e24cefe3d60d3702e6adab13d18b121ba':
Add missing copyright disclaimers to cpufeatures and hello-neon
David 'Digit' Turner [Mon, 22 Feb 2010 22:11:07 +0000 (14:11 -0800)]
Add missing copyright disclaimers to cpufeatures and hello-neon
David 'Digit' Turner [Mon, 22 Feb 2010 18:23:02 +0000 (10:23 -0800)]
am
f4efa044: Update hello-gl2 sample to properly implement EGL Config selection.
Merge commit '
f4efa044a061bf159cd6d7b634371b0cde8cb0b7' into eclair-plus-aosp
* commit '
f4efa044a061bf159cd6d7b634371b0cde8cb0b7':
Update hello-gl2 sample to properly implement EGL Config selection.
David 'Digit' Turner [Sat, 20 Feb 2010 01:59:50 +0000 (17:59 -0800)]
Update hello-gl2 sample to properly implement EGL Config selection.
Also add some comments to explicit what is being done here.
+ add <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.xml
David 'Digit' Turner [Sat, 13 Feb 2010 01:44:11 +0000 (17:44 -0800)]
am
92210fe1: Update documentation + simplify make-release.sh script
Merge commit '
92210fe14b79481c2f087e24ed6e7a2627cc80f3' into eclair-plus-aosp
* commit '
92210fe14b79481c2f087e24ed6e7a2627cc80f3':
Update documentation + simplify make-release.sh script
David 'Digit' Turner [Sat, 13 Feb 2010 01:31:15 +0000 (17:31 -0800)]
am
93369c24: Add the \'hello-neon\' sample app to demonstrate cpufeatures and ARM Neon usage.
Merge commit '
93369c247069b116f39c30530287809f5a190c22' into eclair-plus-aosp
* commit '
93369c247069b116f39c30530287809f5a190c22':
Add the 'hello-neon' sample app to demonstrate cpufeatures and ARM Neon usage.
David 'Digit' Turner [Sat, 13 Feb 2010 01:23:21 +0000 (17:23 -0800)]
Update documentation + simplify make-release.sh script
David 'Digit' Turner [Fri, 12 Feb 2010 23:51:33 +0000 (15:51 -0800)]
Add the 'hello-neon' sample app to demonstrate cpufeatures and ARM Neon usage.
+ Add a small cleanup script (build/tools/cleanup-apps.sh)
+ Minor formatting of hello-gl2 sample.
David Turner [Thu, 11 Feb 2010 19:02:09 +0000 (11:02 -0800)]
am
e6aa4229: Merge "Add NEON support to the NDK build system + docs" into eclair
Merge commit '
e6aa4229876baadfc16fedca1e4b2ec068508974' into eclair-plus-aosp
* commit '
e6aa4229876baadfc16fedca1e4b2ec068508974':
Add NEON support to the NDK build system + docs
David Turner [Thu, 11 Feb 2010 18:56:24 +0000 (10:56 -0800)]
Merge "Add NEON support to the NDK build system + docs" into eclair
James Yum [Wed, 10 Feb 2010 21:01:55 +0000 (13:01 -0800)]
James Yum [Wed, 10 Feb 2010 19:18:23 +0000 (11:18 -0800)]
cleanup
deleted: licensing/ILicenseResultListener.aidl
deleted: licensing/ILicensingService.aidl
deleted: licensing/LicenseChecker.java
deleted: licensing/LicenseCheckerCallback.java
deleted: licensing/LicenseValidator.java
deleted: licensing/Policy.java
deleted: licensing/ResponseData.java
deleted: licensing/StrictPolicy.java
Dirk Dougherty [Wed, 10 Feb 2010 02:42:38 +0000 (18:42 -0800)]
am
4389d65c: Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
Merge commit '
4389d65caea762b276b1b7d6fd560f4b2c4370b3' into eclair-plus-aosp
* commit '
4389d65caea762b276b1b7d6fd560f4b2c4370b3':
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
Dirk Dougherty [Wed, 10 Feb 2010 02:36:48 +0000 (18:36 -0800)]
Merge "Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build." into eclair
Dirk Dougherty [Mon, 8 Feb 2010 18:22:43 +0000 (10:22 -0800)]
Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.
Change-Id: I149fb2aab91d0a2dfc4242a85118bf20dea97e42
David 'Digit' Turner [Tue, 9 Feb 2010 20:25:56 +0000 (12:25 -0800)]
Add NEON support to the NDK build system + docs
You can now define LOCAL_ARM_NEON to 'true' in your Android.mk
to indicate that a whole module must be compiled with NEON support.
Alternatively, use the .neon suffix when listing source files in
LOCAL_SRC_FILES to indicate that they should be built with NEON
support. E.g.:
LOCAL_SRC_FILES := foo.c.neon bar.c zoo.c.arm.neon
Note that .arm.neon is supported, but .neon.arm is NOT.
Also added documentation in docs/CPU-ARM-NEON.TXT
Another patch will provide one or more sample applications
to demonstrate all of this.
David Turner [Mon, 8 Feb 2010 20:52:35 +0000 (12:52 -0800)]
am
3b712fda: Merge "Add \'cpufeatures\' library to perform runtime CPU family/features detection." into eclair
Merge commit '
3b712fda34a3d7a71e6a4ba6ee495b178b2c1830' into eclair-plus-aosp
* commit '
3b712fda34a3d7a71e6a4ba6ee495b178b2c1830':
Add 'cpufeatures' library to perform runtime CPU family/features detection.
David Turner [Mon, 8 Feb 2010 20:35:21 +0000 (12:35 -0800)]
Merge "Add 'cpufeatures' library to perform runtime CPU family/features detection." into eclair
David 'Digit' Turner [Fri, 5 Feb 2010 22:29:11 +0000 (14:29 -0800)]
Add 'cpufeatures' library to perform runtime CPU family/features detection.
It is provided as a static library that NDK developers can link against.
The code is designed to run on all official Android platforms, starting
from Android 1.5.
The Android Open Source Project [Fri, 5 Feb 2010 21:51:37 +0000 (13:51 -0800)]
merge from open-source master
The Android Open Source Project [Fri, 5 Feb 2010 16:23:01 +0000 (08:23 -0800)]
am
c13fbca9: reconcile main tree with open-source eclair
Merge commit '
c13fbca985b333cfb09d2b29875b36594dd44d64' into eclair-plus-aosp
* commit '
c13fbca985b333cfb09d2b29875b36594dd44d64':
Add uses-feature for live wallpaper sample.
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:32 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Megha Joshi [Wed, 3 Feb 2010 20:29:01 +0000 (12:29 -0800)]
am
ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair
Merge commit '
ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1' into eclair-plus-aosp
* commit '
ca7a9d3497b84fe5b3576d9ea1d1cefa32850fd1':
SampleSyncAdapter sample code.
Megha Joshi [Wed, 3 Feb 2010 20:24:47 +0000 (12:24 -0800)]
Merge "SampleSyncAdapter sample code." into eclair
Megha Joshi [Wed, 18 Nov 2009 22:54:03 +0000 (14:54 -0800)]
SampleSyncAdapter sample code.
Raphael Moll [Sat, 30 Jan 2010 01:22:29 +0000 (17:22 -0800)]
am
098a5264: Merge "SDK Manager: post install script to update SDK Setup.exe" into eclair
Merge commit '
098a5264920e089ec6958f8c74dd0983eda5bc0f' into eclair-plus-aosp
* commit '
098a5264920e089ec6958f8c74dd0983eda5bc0f':
SDK Manager: post install script to update SDK Setup.exe
Raphael Moll [Sat, 30 Jan 2010 01:17:26 +0000 (17:17 -0800)]
Merge "SDK Manager: post install script to update SDK Setup.exe" into eclair
David Turner [Fri, 29 Jan 2010 22:52:17 +0000 (14:52 -0800)]
am
50c5ce01: Merge "Force ARMv7 builds to use only 16 FP registers." into eclair
Merge commit '
50c5ce01ca7985b6a76ef67cf171a6eb29c69b80' into eclair-plus-aosp
* commit '
50c5ce01ca7985b6a76ef67cf171a6eb29c69b80':
Force ARMv7 builds to use only 16 FP registers.
David Turner [Fri, 29 Jan 2010 22:44:39 +0000 (14:44 -0800)]
Merge "Force ARMv7 builds to use only 16 FP registers." into eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:07:44 +0000 (14:07 -0800)]
reconcile android-2.1_r1 snapshot
Raphael [Thu, 28 Jan 2010 23:58:20 +0000 (15:58 -0800)]
SDK Manager: post install script to update SDK Setup.exe
SDK Bug:
2404830
Change-Id: I7e2346c95132ff6d26468d589212bf83e15ce407
David 'Digit' Turner [Fri, 29 Jan 2010 01:58:56 +0000 (17:58 -0800)]
Force ARMv7 builds to use only 16 FP registers.
This is needed because upcoming Cortex-A9 devices implement
VFPv3-D16 instead of the assumed VFPv3-D32 and have thus half
the floating-point registers.
James Yum [Thu, 28 Jan 2010 18:51:19 +0000 (10:51 -0800)]
am
b8168f27: Merge "Market licensing server library core." into eclair
Merge commit '
b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2' into eclair-plus-aosp
* commit '
b8168f27f6f5b6b0ced5ef3210c0e89e8d3a5ae2':
Market licensing server library core.
Brett Chabot [Thu, 28 Jan 2010 18:51:15 +0000 (10:51 -0800)]
am
e848f6b2: Merge "Fix cts-content testdef." into eclair
Merge commit '
e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9' into eclair-plus-aosp
* commit '
e848f6b2c72fd07a1ff58cd090c22b3ff5b935f9':
Fix cts-content testdef.
James Yum [Thu, 28 Jan 2010 18:36:53 +0000 (10:36 -0800)]
Merge "Market licensing server library core." into eclair
Romain Guy [Thu, 28 Jan 2010 00:49:32 +0000 (16:49 -0800)]
Add uses-feature for live wallpaper sample.
Romain Guy [Thu, 28 Jan 2010 00:49:32 +0000 (16:49 -0800)]
Add uses-feature for live wallpaper sample.
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
James Yum [Tue, 26 Jan 2010 04:17:53 +0000 (20:17 -0800)]
Market licensing server library core.
new file: ILicenseResultListener.aidl
new file: ILicensingService.aidl
new file: LicenseChecker.java
new file: LicenseCheckerCallback.java
new file: Policy.java
new file: ResponseData.java
new file: StrictPolicy.java
new file: LicenseValidator.java
Brett Chabot [Thu, 28 Jan 2010 01:54:29 +0000 (17:54 -0800)]
Merge "Fix cts-content testdef." into eclair
Brett Chabot [Thu, 28 Jan 2010 01:17:16 +0000 (17:17 -0800)]
Fix cts-content testdef.
Change-Id: I02c98f57c0fbf7cd7fbcdf3e7ba642e0d66acf93
Romain Guy [Thu, 28 Jan 2010 01:04:23 +0000 (17:04 -0800)]
am
897af093: Add uses-feature for live wallpaper sample.
Merge commit '
897af09372ca7c95db6c12554d9ff6fcec81ad58' into eclair-plus-aosp
* commit '
897af09372ca7c95db6c12554d9ff6fcec81ad58':
Add uses-feature for live wallpaper sample.
Romain Guy [Thu, 28 Jan 2010 00:49:32 +0000 (16:49 -0800)]
Add uses-feature for live wallpaper sample.
Change-Id: I766d72ea79e8ef9530b2c485376a3429b530a00f
Raphael [Wed, 27 Jan 2010 00:28:13 +0000 (16:28 -0800)]
am
d51d36fa: Windows SDK: package new tools/find_java.bat
Merge commit '
d51d36fa5444ef5f28dbbe5903949e1a75bb2510' into eclair-plus-aosp
* commit '
d51d36fa5444ef5f28dbbe5903949e1a75bb2510':
Windows SDK: package new tools/find_java.bat
Raphael [Wed, 27 Jan 2010 00:14:55 +0000 (16:14 -0800)]
Windows SDK: package new tools/find_java.bat
SDK Bug:
2315813
Change-Id: Ice0eb6327b153fcaab42477cd4d3aa8ee12e0063
Dirk Dougherty [Sat, 23 Jan 2010 00:49:51 +0000 (16:49 -0800)]
am
c220077d: Merge "SDK doc change: Misc fixes." into eclair
Merge commit '
c220077d52972356ff30d46d47def7669731f0d7' into eclair-plus-aosp
* commit '
c220077d52972356ff30d46d47def7669731f0d7':
SDK doc change: Misc fixes.
Dirk Dougherty [Sat, 23 Jan 2010 00:45:03 +0000 (16:45 -0800)]
Merge "SDK doc change: Misc fixes." into eclair
Dirk Dougherty [Tue, 12 Jan 2010 00:33:57 +0000 (16:33 -0800)]
SDK doc change: Misc fixes.
Bug:
2160782
Change-Id: I44d1d9687df45dae40a6922a37e6b410cc2de835
Xavier Ducrohet [Fri, 22 Jan 2010 18:52:03 +0000 (10:52 -0800)]
am
a6181df4: Add Dell Mini5 to the USB driver.
Merge commit '
a6181df43110ce1bea8a856295ce372ab06a7873' into eclair-plus-aosp
* commit '
a6181df43110ce1bea8a856295ce372ab06a7873':
Add Dell Mini5 to the USB driver.
Xavier Ducrohet [Fri, 22 Jan 2010 01:36:19 +0000 (17:36 -0800)]
Add Dell Mini5 to the USB driver.
Change-Id: If0758e6dc43541fd2877e7d00ff3abf9d354a299
Karl Ostmo [Thu, 10 Dec 2009 22:38:50 +0000 (16:38 -0600)]
resolves Issue #5280: Go to problem in source from LogCat
Eric Rowe [Fri, 15 Jan 2010 01:12:33 +0000 (17:12 -0800)]
am
d98ba32e: DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Merge commit '
d98ba32eeff587a30396fa24728a1150de9dc305' into eclair-plus-aosp
* commit '
d98ba32eeff587a30396fa24728a1150de9dc305':
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Eric Rowe [Fri, 15 Jan 2010 01:12:28 +0000 (17:12 -0800)]
am
7d961f86: DO NOT MERGE Create way to run monkey with multiple scripts.
Merge commit '
7d961f86208b35c12867a049d4bb815da72167d3' into eclair-plus-aosp
* commit '
7d961f86208b35c12867a049d4bb815da72167d3':
DO NOT MERGE Create way to run monkey with multiple scripts.
Eric Rowe [Wed, 4 Nov 2009 02:24:47 +0000 (18:24 -0800)]
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.
Eric Rowe [Wed, 28 Oct 2009 22:25:45 +0000 (15:25 -0700)]
DO NOT MERGE Create way to run monkey with multiple scripts.
By giving multiple -f arguments, the monkey will randomly choose between the
scripts. Also, add the --setup argument which will run a setup script before
starting to play the other scripts in random order.
Eric Rowe [Thu, 14 Jan 2010 03:29:32 +0000 (19:29 -0800)]
am
c1d00a99: Merge "Fix how the monkey counts events for scripts." into eclair
Merge commit '
c1d00a99f3dcacf7b0235e386a2aa0902e07179e' into eclair-plus-aosp
* commit '
c1d00a99f3dcacf7b0235e386a2aa0902e07179e':
Fix how the monkey counts events for scripts.
Eric Rowe [Thu, 14 Jan 2010 03:25:21 +0000 (19:25 -0800)]
Merge "Fix how the monkey counts events for scripts." into eclair
Eric Rowe [Wed, 13 Jan 2010 23:55:53 +0000 (15:55 -0800)]
Fix how the monkey counts events for scripts.
Instead of the monkey counting up to the count times the number of events in the
script, the monkey will now only increment the count when the script reaches the
end of the file. This allows us to have multiple script files with differing
event counts in each.
Conflicts:
cmds/monkey/src/com/android/commands/monkey/Monkey.java
David Turner [Thu, 14 Jan 2010 01:25:42 +0000 (17:25 -0800)]
am
23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
Merge commit '
23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c' into eclair-plus-aosp
* commit '
23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c':
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
David Turner [Thu, 14 Jan 2010 01:21:11 +0000 (17:21 -0800)]
Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
David 'Digit' Turner [Thu, 14 Jan 2010 00:50:57 +0000 (16:50 -0800)]
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
Eric Rowe [Wed, 13 Jan 2010 23:41:28 +0000 (15:41 -0800)]
am
b2fa7700: DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Merge commit '
b2fa770013cf1b6b8bf0619a946a54feafec5197' into eclair-plus-aosp
* commit '
b2fa770013cf1b6b8bf0619a946a54feafec5197':
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Eric Rowe [Tue, 20 Oct 2009 01:06:38 +0000 (18:06 -0700)]
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Fix javadoc comment in MonkeySourceRandom.java and combine raw events and user
events in MonkeySourceScript.java. Also, fix bug where too few arguments in
the script causes a RuntimeException.
Raphael Moll [Tue, 12 Jan 2010 23:38:37 +0000 (15:38 -0800)]
am
2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739' into eclair-plus-aosp
* commit '
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:32:03 +0000 (15:32 -0800)]
Merge "Add etc1tool to Windows SDK." into eclair
The Android Open Source Project [Tue, 12 Jan 2010 23:18:14 +0000 (15:18 -0800)]
android-2.1_r1 snapshot
Xavier Ducrohet [Tue, 12 Jan 2010 20:46:21 +0000 (12:46 -0800)]
am
2f2fb96b: Make the SDK packaging put the samples in the root folder.
Merge commit '
2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp
* commit '
2f2fb96b4b037a016336a98e3b637f4394e1f323':
Make the SDK packaging put the samples in the root folder.
Xavier Ducrohet [Tue, 12 Jan 2010 20:32:12 +0000 (12:32 -0800)]
Make the SDK packaging put the samples in the root folder.
Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
Raphael [Tue, 12 Jan 2010 19:11:07 +0000 (11:11 -0800)]
Add etc1tool to Windows SDK.
SDK BUG
2368918
This depends on Change I1b4f5e39 from build/core.
Change-Id: I8348514506742aa70cdee057e94069a67357a689
Trevor Johns [Mon, 11 Jan 2010 22:05:34 +0000 (14:05 -0800)]
am
c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
Merge commit '
c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp
* commit '
c7d2c4580552a4921ed1f1fa78b0a180eb995193':
Adding index file for BusinessCard sample. This will be displayed in the HTML
Trevor Johns [Mon, 11 Jan 2010 22:00:50 +0000 (14:00 -0800)]
Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair
Xavier Ducrohet [Mon, 11 Jan 2010 20:07:57 +0000 (12:07 -0800)]
am
ef54fe9a: Fix compilation error by declaring stride before the first goto
Merge commit '
ef54fe9aaab4124e61850062d2212b20c20c8ea5' into eclair-plus-aosp
* commit '
ef54fe9aaab4124e61850062d2212b20c20c8ea5':
Fix compilation error by declaring stride before the first goto
Xavier Ducrohet [Mon, 11 Jan 2010 20:00:41 +0000 (12:00 -0800)]
Fix compilation error by declaring stride before the first goto
Change-Id: I242601038dc7290eac0e4745abaa1ec35d859c09
Trevor Johns [Fri, 8 Jan 2010 00:44:43 +0000 (16:44 -0800)]
Adding index file for BusinessCard sample. This will be displayed in the HTML
documentation when this sample is selected via the Resource tab.