OSDN Git Service

android-x86/development.git
13 years agoam aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
Jeff Hamilton [Thu, 13 Jan 2011 20:46:08 +0000 (12:46 -0800)]
am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.

* commit 'aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
  Add a sample for the NFC foreground dispatch APIs.

13 years agoAdd a sample for the NFC foreground dispatch APIs.
Jeff Hamilton [Wed, 12 Jan 2011 20:21:40 +0000 (14:21 -0600)]
Add a sample for the NFC foreground dispatch APIs.

Change-Id: Iee532d53b4d9354977414b0302b386a940606ab3

13 years agoam ac96a560: Merge "update notepad menu icons with new styles for GB (20% smaller...
Scott Main [Mon, 10 Jan 2011 21:36:20 +0000 (13:36 -0800)]
am ac96a560: Merge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread

* commit 'ac96a5607de2fd643bdf43e1711aea8afa74c04b':
  update notepad menu icons with new styles for GB (20% smaller)

13 years agoMerge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread
Scott Main [Mon, 10 Jan 2011 21:33:08 +0000 (13:33 -0800)]
Merge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread

13 years agoam f823ebad: Switch GB SDK to 2.4 / API 10. Do not merge.
Raphael [Mon, 10 Jan 2011 19:03:59 +0000 (11:03 -0800)]
am f823ebad: Switch GB SDK to 2.4 / API 10. Do not merge.

* commit 'f823ebad02e2d699490dc7e975054146c67251cc':
  Switch GB SDK to 2.4 / API 10. Do not merge.

13 years agoSwitch GB SDK to 2.4 / API 10. Do not merge.
Raphael [Fri, 7 Jan 2011 23:28:48 +0000 (15:28 -0800)]
Switch GB SDK to 2.4 / API 10. Do not merge.

Change-Id: I8e3c97c5c281b05e2e03b6739221ea8b13536bd3

13 years agoam daf0b895: Cherry-pick f0e5e933 from master.
Xavier Ducrohet [Fri, 7 Jan 2011 21:50:42 +0000 (13:50 -0800)]
am daf0b895: Cherry-pick f0e5e933 from master.

* commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
  Cherry-pick f0e5e933 from master.

13 years agoCherry-pick f0e5e933 from master.
Xavier Ducrohet [Thu, 6 Jan 2011 21:31:24 +0000 (13:31 -0800)]
Cherry-pick f0e5e933 from master.

Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: I520c485f4ef9f6d9d2eea126ed46d96b5fc3e785

13 years agoam 89ee8c72: Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread
Raphael [Fri, 7 Jan 2011 17:24:06 +0000 (09:24 -0800)]
am 89ee8c72: Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread

* commit '89ee8c72f35907a3546fb067eef2bdc8e134d53b':
  SDK for 2.3.1 -- DO NOT MERGE

13 years agoMerge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread
Raphael [Fri, 7 Jan 2011 09:22:18 +0000 (01:22 -0800)]
Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread

13 years agoam 01f08464: Import translations for additional languages.
Eric Fischer [Fri, 7 Jan 2011 04:29:42 +0000 (20:29 -0800)]
am 01f08464: Import translations for additional languages.

* commit '01f0846415ed75a8e30a26bf5e064c46025df2eb':
  Import translations for additional languages.

13 years agoam dde7492d: Merge "Move emulator skins to development.git"
Xavier Ducrohet [Fri, 7 Jan 2011 01:35:01 +0000 (17:35 -0800)]
am dde7492d: Merge "Move emulator skins to development.git"

* commit 'dde7492d4b34ba810329ad080a078bfb870a4507':
  Move emulator skins to development.git

13 years agoMerge "Move emulator skins to development.git"
Xavier Ducrohet [Thu, 6 Jan 2011 22:17:30 +0000 (14:17 -0800)]
Merge "Move emulator skins to development.git"

13 years agoMove emulator skins to development.git
Xavier Ducrohet [Thu, 6 Jan 2011 21:31:24 +0000 (13:31 -0800)]
Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: Ib786287b43f639c6ae80bf109ac4fe5b12635676

13 years agoImport translations for additional languages.
Eric Fischer [Thu, 6 Jan 2011 18:27:56 +0000 (10:27 -0800)]
Import translations for additional languages.

Change-Id: I763f3be3ac076d68b6253b31963a9f476e2004a8

13 years agoam 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"
Raphael Moll [Wed, 5 Jan 2011 23:48:26 +0000 (15:48 -0800)]
am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"

* commit '1bf9f6936e423a686b623752e9f008acefaa1057':
  Use OUT_DIR in atree to find android.jar

13 years agoMerge "Use OUT_DIR in atree to find android.jar"
Raphael Moll [Wed, 5 Jan 2011 23:35:32 +0000 (15:35 -0800)]
Merge "Use OUT_DIR in atree to find android.jar"

13 years agoUse OUT_DIR in atree to find android.jar
Raphael Moll [Wed, 5 Jan 2011 22:59:27 +0000 (14:59 -0800)]
Use OUT_DIR in atree to find android.jar

Depends on change Iabbe9053 from build/core.

Change-Id: I0b6e29a5282c2ca6ff329981e5f8d2c677e6e84b

13 years agoam cbc7f695: ndk: Replace \'asm\' with \'__asm__\' in <asm/byteorder.h>
David 'Digit' Turner [Wed, 5 Jan 2011 22:18:11 +0000 (14:18 -0800)]
am cbc7f695: ndk: Replace \'asm\' with \'__asm__\' in <asm/byteorder.h>

* commit 'cbc7f6954872e85c8cf1c6af7e02d0cf471cc1a8':
  ndk: Replace 'asm' with '__asm__' in <asm/byteorder.h>

13 years agondk: Replace 'asm' with '__asm__' in <asm/byteorder.h>
David 'Digit' Turner [Wed, 5 Jan 2011 22:08:29 +0000 (23:08 +0100)]
ndk: Replace 'asm' with '__asm__' in <asm/byteorder.h>

See https://review.source.android.com/#change,20076 for details.
Essentially this is to allow compilation with -std=c99

Change-Id: I4c830c38b2615352765ee40773c5aa701e5d2b68

13 years agoSDK for 2.3.1 -- DO NOT MERGE
Raphael [Wed, 22 Dec 2010 20:04:28 +0000 (12:04 -0800)]
SDK for 2.3.1 -- DO NOT MERGE

Change-Id: I2be72f53a6fe2d2bc1371f57439a4c5da972dcbb

13 years agoam 9efea49e: cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d docs...
Scott Main [Wed, 15 Dec 2010 19:55:53 +0000 (11:55 -0800)]
am 9efea49e: cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d docs: fix broken links in sample docs

* commit '9efea49e40f3e3784cfa1c9fd67a6ca9ff5270e7':
  cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d docs: fix broken links in sample docs

13 years agocherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d
Scott Main [Wed, 8 Dec 2010 17:26:56 +0000 (09:26 -0800)]
cherrypick Change-Id: I999748ceec87ae5e6ac04c573f6055e6a7f7176d
docs: fix broken links in sample docs

Change-Id: Icbc2c16b9f4caee25ab2265ea5425c57f0989ab1

13 years agoam 9ddaf219: Add missing declarations to <netinet/in.h>
David 'Digit' Turner [Wed, 15 Dec 2010 09:31:02 +0000 (01:31 -0800)]
am 9ddaf219: Add missing declarations to <netinet/in.h>

* commit '9ddaf219fa051a1b2c1a3b713ea37a91204b378e':
  Add missing declarations to <netinet/in.h>

13 years agoam 90887627: ndk: Update headers and libraries for API level 9
David 'Digit' Turner [Wed, 15 Dec 2010 09:30:54 +0000 (01:30 -0800)]
am 90887627: ndk: Update headers and libraries for API level 9

* commit '90887627f185ea795fd8620bb916bd14a9f51041':
  ndk: Update headers and libraries for API level 9

13 years agoAdd missing declarations to <netinet/in.h>
David 'Digit' Turner [Tue, 14 Dec 2010 13:42:52 +0000 (14:42 +0100)]
Add missing declarations to <netinet/in.h>

These are required to properly build the Boost libraries with the
Android NDK.

Change-Id: Ice272f24b359ffce19838f5500641c4fcda8e57f

13 years agondk: Update headers and libraries for API level 9
David 'Digit' Turner [Tue, 30 Nov 2010 22:19:55 +0000 (23:19 +0100)]
ndk: Update headers and libraries for API level 9

Change-Id: I39eded0065145803b51b22cdc18abef43abe426c

13 years agoam 43a1de66: am 8b70d301: Merge "USB Driver INF file for rev 4."
Raphael Moll [Wed, 8 Dec 2010 23:24:19 +0000 (15:24 -0800)]
am 43a1de66: am 8b70d301: Merge "USB Driver INF file for rev 4."

* commit '43a1de66a529964f2b7901e3506417b97595ee06':
  USB Driver INF file for rev 4.

13 years agoam 8b70d301: Merge "USB Driver INF file for rev 4."
Raphael Moll [Wed, 8 Dec 2010 23:21:01 +0000 (15:21 -0800)]
am 8b70d301: Merge "USB Driver INF file for rev 4."

* commit '8b70d30188f0dc42040643c13135f60c3294eae4':
  USB Driver INF file for rev 4.

13 years agoMerge "USB Driver INF file for rev 4."
Raphael Moll [Wed, 8 Dec 2010 23:12:10 +0000 (15:12 -0800)]
Merge "USB Driver INF file for rev 4."

13 years agoam 088edcda: am a2ba6854: Merge "Specific instructions about using these Eclipse...
Xavier Ducrohet [Tue, 7 Dec 2010 23:32:14 +0000 (15:32 -0800)]
am 088edcda: am a2ba6854: Merge "Specific instructions about using these Eclipse settings."

* commit '088edcdadeb52bc56d9ca1a14c263139885e5e39':
  Specific instructions about using these Eclipse settings.

13 years agoam a2ba6854: Merge "Specific instructions about using these Eclipse settings."
Xavier Ducrohet [Tue, 7 Dec 2010 23:29:52 +0000 (15:29 -0800)]
am a2ba6854: Merge "Specific instructions about using these Eclipse settings."

* commit 'a2ba68544f715bb9043703e33de29ead328fe0f7':
  Specific instructions about using these Eclipse settings.

13 years agoMerge "Specific instructions about using these Eclipse settings."
Xavier Ducrohet [Tue, 7 Dec 2010 23:16:52 +0000 (15:16 -0800)]
Merge "Specific instructions about using these Eclipse settings."

13 years agoSpecific instructions about using these Eclipse settings.
Tim Baverstock [Fri, 3 Dec 2010 11:10:01 +0000 (11:10 +0000)]
Specific instructions about using these Eclipse settings.

Change-Id: I0ca386f58988b3e8f3c518438da79af0ffdf0776

13 years agoUSB Driver INF file for rev 4.
Raphael Moll [Mon, 6 Dec 2010 23:20:15 +0000 (15:20 -0800)]
USB Driver INF file for rev 4.

Change-Id: I6235db54e20557231dffe7924fafb5ce72654a06

13 years agoam 0e5e7996: Merge from open-source master
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:51:01 +0000 (07:51 -0800)]
am 0e5e7996: Merge from open-source master

* commit '0e5e799676a7a6ac79727dd815aff75957e5b094':
  Remove obsolete USB Driver "legacy" sources & files.

13 years agoMerge from open-source master
Jean-Baptiste Queru [Thu, 2 Dec 2010 15:46:37 +0000 (07:46 -0800)]
Merge from open-source master

Change-Id: Icc569e311600504c75304c79fa878614ac597fba

13 years agoMerge "Remove obsolete USB Driver "legacy" sources & files."
Raphael Moll [Wed, 1 Dec 2010 21:22:40 +0000 (13:22 -0800)]
Merge "Remove obsolete USB Driver "legacy" sources & files."

13 years agoRemove obsolete USB Driver "legacy" sources & files.
Raphael Moll [Wed, 1 Dec 2010 20:51:15 +0000 (12:51 -0800)]
Remove obsolete USB Driver "legacy" sources & files.

Change-Id: I4357c1417e6472395b803b799f43aae18f845be9

13 years agoam cec3f598: Merge "Add an API demo showcasing the new rotation vector sensor" into...
Mathias Agopian [Tue, 30 Nov 2010 22:08:47 +0000 (14:08 -0800)]
am cec3f598: Merge "Add an API demo showcasing the new rotation vector sensor" into gingerbread

* commit 'cec3f598e6e7e527583daae393b3d0192af77baf':
  Add an API demo showcasing the new rotation vector sensor

13 years agoMerge "Add an API demo showcasing the new rotation vector sensor" into gingerbread
Mathias Agopian [Tue, 30 Nov 2010 22:05:20 +0000 (14:05 -0800)]
Merge "Add an API demo showcasing the new rotation vector sensor" into gingerbread

13 years agoam 4171f296: Add AcceleromerPlay sample app to SDK samples package
Dirk Dougherty [Tue, 30 Nov 2010 02:13:49 +0000 (18:13 -0800)]
am 4171f296: Add AcceleromerPlay sample app to SDK samples package

* commit '4171f296681a0ef0a1df21fdc792fc9997c1146b':
  Add AcceleromerPlay sample app to SDK samples package

13 years agoAdd AcceleromerPlay sample app to SDK samples package
Dirk Dougherty [Thu, 25 Nov 2010 00:12:16 +0000 (16:12 -0800)]
Add AcceleromerPlay sample app to SDK samples package

Change-Id: Id7ae8de4f3543169d6d707a470f0b872e00e953f

13 years agoam c73f37ba: Remove HeavyWeight sample from SDK samples package.
Dirk Dougherty [Tue, 30 Nov 2010 01:07:26 +0000 (17:07 -0800)]
am c73f37ba: Remove HeavyWeight sample from SDK samples package.

* commit 'c73f37ba5790cd1fe588d0f5886b677a7eaa39f0':
  Remove HeavyWeight sample from SDK samples package.

13 years agoRemove HeavyWeight sample from SDK samples package.
Dirk Dougherty [Tue, 30 Nov 2010 00:49:12 +0000 (16:49 -0800)]
Remove HeavyWeight sample from SDK samples package.

Change-Id: Id2113b8a0cd1a7cc3d807919e6c40c50917baaea

13 years agoam 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread
Roman Nurik [Mon, 29 Nov 2010 23:54:07 +0000 (15:54 -0800)]
am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread

* commit '14789d1eab905728da4f6995816c80716caf52f4':
  Add NFCDemo to sdk.atree

13 years agoam dbe66332: Extended camera preview to switch between multiple available device...
Anirudh Dewani [Mon, 29 Nov 2010 23:54:05 +0000 (15:54 -0800)]
am dbe66332: Extended camera preview to switch between multiple available device cameras

* commit 'dbe66332e278962c058a596353b839a2fd6dca1b':
  Extended camera preview to switch between multiple available device cameras

13 years agoMerge "Add NFCDemo to sdk.atree" into gingerbread
Roman Nurik [Mon, 29 Nov 2010 23:52:21 +0000 (15:52 -0800)]
Merge "Add NFCDemo to sdk.atree" into gingerbread

13 years agoAdd NFCDemo to sdk.atree
Roman Nurik [Mon, 29 Nov 2010 23:45:50 +0000 (15:45 -0800)]
Add NFCDemo to sdk.atree

Change-Id: I2e0a330a31d6d3c0b8c70c38af60118461e7e403

13 years agoupdate notepad menu icons with new styles for GB (20% smaller)
Scott Main [Mon, 29 Nov 2010 19:56:03 +0000 (11:56 -0800)]
update notepad menu icons with new styles for GB (20% smaller)

Change-Id: Ie5b9e42d56688558e9e3220bb15729d5142775ba

13 years agoExtended camera preview to switch between multiple available device cameras
Anirudh Dewani [Tue, 9 Nov 2010 05:45:25 +0000 (11:15 +0530)]
Extended camera preview to switch between multiple available device cameras

Change-Id: I8e97d6182bf02cba29ae3bc9f1a7ef21a277117e

13 years agoAdd an API demo showcasing the new rotation vector sensor
Mathias Agopian [Tue, 23 Nov 2010 09:05:13 +0000 (01:05 -0800)]
Add an API demo showcasing the new rotation vector sensor

Change-Id: I3f00560b0340db31779259aa98efc174b0b645cd

13 years agoam 72cb8dd1: Merge "Updated Android build instructions to mention envsetup.sh and...
Jean-Baptiste Queru [Wed, 24 Nov 2010 21:49:40 +0000 (13:49 -0800)]
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.

13 years agoMerge "Updated Android build instructions to mention envsetup.sh and lunch."
Jean-Baptiste Queru [Wed, 24 Nov 2010 21:38:32 +0000 (13:38 -0800)]
Merge "Updated Android build instructions to mention envsetup.sh and lunch."

13 years agoUpdated Android build instructions to mention envsetup.sh and lunch.
Sascha Brawer [Wed, 24 Nov 2010 14:20:48 +0000 (15:20 +0100)]
Updated Android build instructions to mention envsetup.sh and lunch.

Change-Id: I3922953766a2162c27d80630736e074a2b3dfb95

13 years agoam 1e7011fc: ndk: Add auto-generated <android/api-level.h>
David 'Digit' Turner [Wed, 24 Nov 2010 06:53:01 +0000 (22:53 -0800)]
am 1e7011fc: ndk: Add auto-generated <android/api-level.h>

* commit '1e7011fcd5eee3190b436881af33cd9715eb8d36':
  ndk: Add auto-generated <android/api-level.h>

13 years agoresolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp
Raphael [Tue, 23 Nov 2010 23:36:17 +0000 (15:36 -0800)]
resolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp

Change-Id: I670002d7f8606f22c438057883e1a4a9fe63ebf6

13 years agoMerge "Win SDK: Split the win-sdk makefile and script into 2 parts."
Raphael Moll [Tue, 23 Nov 2010 22:35:05 +0000 (14:35 -0800)]
Merge "Win SDK: Split the win-sdk makefile and script into 2 parts."

13 years agoresolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp
Raphael [Tue, 23 Nov 2010 10:44:59 +0000 (02:44 -0800)]
resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp

Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9

13 years agoMerge "Move <uses-sdk> before <application> in samples."
Raphael Moll [Tue, 23 Nov 2010 05:26:57 +0000 (21:26 -0800)]
Merge "Move <uses-sdk> before <application> in samples."

13 years agoWin SDK: Split the win-sdk makefile and script into 2 parts.
Raphael Moll [Thu, 11 Nov 2010 23:58:28 +0000 (15:58 -0800)]
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

13 years agondk: Add auto-generated <android/api-level.h>
David 'Digit' Turner [Mon, 22 Nov 2010 21:38:57 +0000 (22:38 +0100)]
ndk: Add auto-generated <android/api-level.h>

See ndk.git/build/tools/dev-generate-api-levels.sh

Change-Id: Id64e565e7da6bf23f4bfa0fca52a06dbfe843c37

13 years agoMove <uses-sdk> before <application> in samples.
Raphael Moll [Mon, 22 Nov 2010 20:39:47 +0000 (12:39 -0800)]
Move <uses-sdk> before <application> in samples.

Change-Id: Iac2644d350235e19f5109aeb25a8d6d4eb1af3fe

13 years agoam f328f262: Merge "Remove .classpath and .project files" into gingerbread
Glenn Kasten [Tue, 16 Nov 2010 00:25:58 +0000 (16:25 -0800)]
am f328f262: Merge "Remove .classpath and .project files" into gingerbread

* commit 'f328f262fd66f90a8ebda011e75dfcc11b65279a':
  Remove .classpath and .project files

13 years agoMerge "Remove .classpath and .project files" into gingerbread
Glenn Kasten [Tue, 16 Nov 2010 00:23:34 +0000 (16:23 -0800)]
Merge "Remove .classpath and .project files" into gingerbread

13 years agoam 7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread
Megha Joshi [Sat, 13 Nov 2010 02:32:14 +0000 (18:32 -0800)]
am 7f39ff80: Merge "NFC sample app  (DO NOT MERGE)" into gingerbread

* commit '7f39ff802b6281b563f341dc89c58a43ec6bdd99':
  NFC sample app  (DO NOT MERGE)

13 years agoMerge "NFC sample app (DO NOT MERGE)" into gingerbread
Megha Joshi [Sat, 13 Nov 2010 02:30:14 +0000 (18:30 -0800)]
Merge "NFC sample app  (DO NOT MERGE)" into gingerbread

13 years agoNFC sample app (DO NOT MERGE)
Megha Joshi [Wed, 3 Nov 2010 06:27:24 +0000 (23:27 -0700)]
NFC sample app  (DO NOT MERGE)

Change-Id: I1d1d67bbc6760cea1a0c6eccfa4d9f7b1398cd4d

13 years agoam 809ec924: Native audio example
Glenn Kasten [Mon, 8 Nov 2010 20:13:19 +0000 (12:13 -0800)]
am 809ec924: Native audio example

* commit '809ec924d28657e8be8ca36871ce6ddbfedcdc40':
  Native audio example

13 years agoam 4bd402f5: Merge "Fix DOS end-of-lines in winusb INF file."
Raphael Moll [Mon, 8 Nov 2010 18:13:55 +0000 (10:13 -0800)]
am 4bd402f5: Merge "Fix DOS end-of-lines in winusb INF file."

* commit '4bd402f5f1f15a7e9f13ae0104d32285113d780b':
  Fix DOS end-of-lines in winusb INF file.

13 years agoMerge "Fix DOS end-of-lines in winusb INF file."
Raphael Moll [Mon, 8 Nov 2010 18:02:03 +0000 (10:02 -0800)]
Merge "Fix DOS end-of-lines in winusb INF file."

13 years agoNative audio example
Glenn Kasten [Tue, 26 Oct 2010 19:07:15 +0000 (12:07 -0700)]
Native audio example

Change-Id: Ia48597d3e94d178ec95a396c545e4a95de7c88f8

13 years agoFix DOS end-of-lines in winusb INF file.
Raphael Moll [Fri, 5 Nov 2010 23:35:01 +0000 (16:35 -0700)]
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

13 years agoam 186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread
David 'Digit' Turner [Thu, 4 Nov 2010 11:11:19 +0000 (04:11 -0700)]
am 186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread

* commit '186ce6d54380d2808acf341aec676f9c5ec56b63':
  NDK: Last cleanup of the platform headers

13 years agoMerge "NDK: Last cleanup of the platform headers" into gingerbread
David 'Digit' Turner [Thu, 4 Nov 2010 11:09:48 +0000 (04:09 -0700)]
Merge "NDK: Last cleanup of the platform headers" into gingerbread

13 years agoam cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
David 'Digit' Turner [Thu, 4 Nov 2010 11:08:23 +0000 (04:08 -0700)]
am cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread

* commit 'cc5809bf2fdae2ea7b5d84b21875cd2220c66105':
  ndk: Use __ANDROID__ instead of ANDROID.

13 years agoNDK: Last cleanup of the platform headers
David 'Digit' Turner [Wed, 27 Oct 2010 23:28:43 +0000 (16:28 -0700)]
NDK: Last cleanup of the platform headers

- fix a declaration omission in 3/<grp.h>
- add missing 8/<err.h>
- simplify 8/<stdio.h>
- update 9/ headers to the latest Bionic versions
- fix a typo in android_native_app_glue.h
- use __BEGIN_DECLS .. __END_DECLS whenever possible.
- remove C++-style comments from headers

Change-Id: I58b98b3973cde494436206194ba33416a11ca8ee

13 years agoMerge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
David 'Digit' Turner [Thu, 4 Nov 2010 11:06:31 +0000 (04:06 -0700)]
Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread

13 years agoam 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
Alexander Lucas [Wed, 3 Nov 2010 22:35:24 +0000 (15:35 -0700)]
am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread

* commit '48cc36d936ea132665c35a1f8c9a2b4b9207ec0b':
  Added SIP Demo to sample apps.

13 years agoMerge "Added SIP Demo to sample apps." into gingerbread
Alexander Lucas [Wed, 3 Nov 2010 22:32:48 +0000 (15:32 -0700)]
Merge "Added SIP Demo to sample apps." into gingerbread

13 years agoAdded SIP Demo to sample apps.
Alexander Lucas [Wed, 3 Nov 2010 04:50:45 +0000 (21:50 -0700)]
Added SIP Demo to sample apps.

Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f

13 years agoam 49fe761d: Merge "Cherry pick from master: Sample app and test package for a Servic...
Dirk Dougherty [Wed, 3 Nov 2010 20:13:33 +0000 (13:13 -0700)]
am 49fe761d: Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread

* commit '49fe761ddcf779f1913d22706a2a6153b80aa397':
  Cherry pick from master: Sample app and test package for a Service

13 years agoMerge "Cherry pick from master: Sample app and test package for a Service" into ginge...
Dirk Dougherty [Wed, 3 Nov 2010 20:12:11 +0000 (13:12 -0700)]
Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread

13 years agoam bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer...
Roman Nurik [Wed, 3 Nov 2010 14:56:40 +0000 (07:56 -0700)]
am bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread

* commit 'bccecc2b871749695148a7dcf27ff5b8655a77a0':
  Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)

13 years agoMerge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
Roman Nurik [Wed, 3 Nov 2010 14:55:06 +0000 (07:55 -0700)]
Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread

13 years agoam fc187b1e: Merge "update native_window.h ndk header" into gingerbread
David Turner [Tue, 2 Nov 2010 08:51:44 +0000 (01:51 -0700)]
am fc187b1e: Merge "update native_window.h ndk header" into gingerbread

* commit 'fc187b1e3a73275dba91e98d912aa23d7b097fc9':
  update native_window.h ndk header

13 years agoMerge "update native_window.h ndk header" into gingerbread
David Turner [Tue, 2 Nov 2010 08:49:47 +0000 (01:49 -0700)]
Merge "update native_window.h ndk header" into gingerbread

13 years agoam 10795d84: Declare localeconv() in <locale.h>
David 'Digit' Turner [Tue, 2 Nov 2010 08:43:46 +0000 (01:43 -0700)]
am 10795d84: Declare localeconv() in <locale.h>

* commit '10795d840b0991fd6150475803610b125d4ea262':
  Declare localeconv() in <locale.h>

13 years agoupdate native_window.h ndk header
Mathias Agopian [Mon, 1 Nov 2010 21:30:30 +0000 (14:30 -0700)]
update native_window.h ndk header

Change-Id: I70178a1ddd94279a102c2d25d2ce0459cec9d13a

13 years agondk: Use __ANDROID__ instead of ANDROID.
David 'Digit' Turner [Sun, 31 Oct 2010 03:41:23 +0000 (20:41 -0700)]
ndk: Use __ANDROID__ instead of ANDROID.

The platform headers use the ANDROID macro as a platform test.
This macro is set by the NDK build script explicitely, but it
is better to use __ANDROID__, which is also set by our toolchain
as a compiler prebuilt macro.

This allows usage of these headers with our standalone toolchain.

Change-Id: I431c54e29e502bb9da7a52ef7a58a6341211b4db

13 years agoRemove .classpath and .project files
Glenn Kasten [Fri, 29 Oct 2010 22:22:12 +0000 (15:22 -0700)]
Remove .classpath and .project files

During review of the patch set for native audio sample, someone
mentioned there should not be these files in git.  But we seem to
be inconsistent about this (for example these files).  Can you
please let me know whether they should be there or not, and then I
will update the native audio patch set. Thanks!

Change-Id: I6d27f4936f8c60efb05a89a4ba11e77e66aaf539

13 years agoDeclare localeconv() in <locale.h>
David 'Digit' Turner [Fri, 29 Oct 2010 00:39:11 +0000 (17:39 -0700)]
Declare localeconv() in <locale.h>

The function is not implemented by our C library, but it is not
possible to build GNU libstdc++-v3 if the declaration is not part
of this header.

Change-Id: Iff6fa63465dde0d4e38c0f91709475bb35b31af9

13 years agoam 42197997: Merge "SDK Windows: Package customized proguard.bat scripts."
Raphael Moll [Tue, 26 Oct 2010 22:42:14 +0000 (15:42 -0700)]
am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts."

13 years agoMerge "SDK Windows: Package customized proguard.bat scripts."
Raphael Moll [Tue, 26 Oct 2010 22:32:23 +0000 (15:32 -0700)]
Merge "SDK Windows: Package customized proguard.bat scripts."

13 years agoAdd ApiDemo for android.media.audiofx (Visualizer and Equalizer)
Roman Nurik [Fri, 22 Oct 2010 22:39:25 +0000 (15:39 -0700)]
Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)

Change-Id: I4fa3b0aff4edfe80533066a81b0eacc97caa6f86

13 years agoam 5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID."...
Mathias Agopian [Tue, 26 Oct 2010 19:22:09 +0000 (12:22 -0700)]
am 5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread

13 years agoMerge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:49 +0000 (12:18 -0700)]
Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread

13 years agoam 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into ginge...
Jack Palevich [Tue, 26 Oct 2010 17:27:09 +0000 (10:27 -0700)]
am 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread

13 years agoMerge "Remove unused Grid object from LabelMaker.java class." into gingerbread
Jack Palevich [Tue, 26 Oct 2010 17:25:12 +0000 (10:25 -0700)]
Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread

13 years agoam f0c01122: simplify a bit the native-activity sample code
Mathias Agopian [Tue, 26 Oct 2010 14:24:45 +0000 (07:24 -0700)]
am f0c01122: simplify a bit the native-activity sample code