Commit Graph

5848 Commits

Author SHA1 Message Date
David 'Digit' Turner
9ad28785ba Fix pwrite() declaration in NDK platform headers.
The corresponding fix is already in the Bionic libc source tree.

See http://code.google.com/p/android/issues/detail?id=8908

Change-Id: Id1329f996cd6708e46f48d33d998b8b3d26bf5d7
2011-03-15 16:30:35 +01:00
David 'Digit' Turner
fbd686b031 am a1ae75c8: am 2876ff6b: Merge "emulator: Move platform-specific modules to development.git"
* commit 'a1ae75c868ffb1171ba0f3b3644c84b571a3dbce':
  emulator: Move platform-specific modules to development.git
2011-03-14 11:50:48 -07:00
Ying Wang
65140fc2fc am ff3d4bc4: resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp
* commit 'ff3d4bc42b22093695896bc319c59b139aa2c6f6':
  Disable ccache when use mingw.
2011-03-14 10:53:48 -07:00
David 'Digit' Turner
b2c8dbeafb am 5ac5e8d7: Merge "ndk: Fix stdint.h definitions for C++"
* commit '5ac5e8d7b5c4707190d367c827a7562b08c8e50d':
  ndk: Fix stdint.h definitions for C++
2011-03-14 10:53:18 -07:00
David 'Digit' Turner
a1ae75c868 am 2876ff6b: Merge "emulator: Move platform-specific modules to development.git"
* commit '2876ff6b931989d8943311412465d2b849c5e2a2':
  emulator: Move platform-specific modules to development.git
2011-03-14 10:25:24 -07:00
David 'Digit' Turner
2876ff6b93 Merge "emulator: Move platform-specific modules to development.git" 2011-03-14 09:42:01 -07:00
Ying Wang
974973029a am b0948c5a: am b058af05: Disable ccache when using mingw.
* commit 'b0948c5a6e6615c8d4497b3161d200464edb5297':
  Disable ccache when using mingw.
2011-03-11 14:18:47 -08:00
Ying Wang
b0948c5a6e am b058af05: Disable ccache when using mingw.
* commit 'b058af052efa1dccf38eef8993008920088ff188':
  Disable ccache when using mingw.
2011-03-11 14:11:11 -08:00
Ying Wang
b058af052e Disable ccache when using mingw.
Change-Id: I40ec9f6dfbf54b362b8a87cde7774b396b46b063
2011-03-11 13:59:34 -08:00
Ying Wang
ff3d4bc42b resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp
Change-Id: I05bf91403b3160ff6db7b9a60b3c1c5f1ded0c5b
2011-03-11 12:59:56 -08:00
David 'Digit' Turner
5ac5e8d7b5 Merge "ndk: Fix stdint.h definitions for C++" 2011-03-11 09:32:54 -08:00
David 'Digit' Turner
e59bd87056 emulator: Move platform-specific modules to development.git
This copies the platform-specific emulator modules from sdk.git into
development.git/tools/emulator/system/. Note the use of guard variables
to prevent clashes when the original modules are still in the tree.

The goal is to submit this and https://review.source.android.com/#change,21737,
then later remove the modules from sdk.git when we move the internal sdk branch
to the appropriate tools_rXXX branch.

Change-Id: I762d0efb72d93a935d96c4549f36029c258c3ef9
2011-03-11 16:38:28 +01:00
David 'Digit' Turner
c7d8870875 ndk: Fix stdint.h definitions for C++
Fix the stdint.h header for C++ inclusion. The limit and constant related macros
should only be defined if __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS are
defined, respectively.

Change-Id: I85b00ed857f40b9c17d530f1405f0f098c5f10f3
2011-03-11 14:42:12 +01:00
Ying Wang
1a6a849bcb Disable ccache when use mingw.
Change-Id: Ieff363f9c4433bba53d1e94a25477c60933666e2
2011-03-10 18:25:51 -08:00
David 'Digit' Turner
c15487127a am 9e17cec2: Merge "ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition."
* commit '9e17cec235cbcd3832722a975e9215bf23b6a9ea':
  ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition.
2011-03-10 01:55:28 -08:00
David 'Digit' Turner
9e17cec235 Merge "ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition." 2011-03-10 01:26:39 -08:00
David 'Digit' Turner
114db2a1c4 ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition.
This is a fix for http://code.google.com/p/android/issues/detail?id=15306

Also see https://review.source.android.com//#change,21699 for the corresponding
fix in the C library headers.

Change-Id: I1c46ee9fc7eb120a98f47719a0407b81001f5ac0
2011-03-10 10:24:52 +01:00
Jeff Brown
fcaa6857d1 am 0d4619cc: Merge "Update samples to use new getMotionRanges() API." into honeycomb-mr1
* commit '0d4619cc48c4fff03a3a12f121ae55bc848d40d9':
  Update samples to use new getMotionRanges() API.
2011-03-09 18:36:43 -08:00
Jeff Brown
0d4619cc48 Merge "Update samples to use new getMotionRanges() API." into honeycomb-mr1 2011-03-09 18:33:55 -08:00
Dianne Hackborn
4d6299be11 am 6b3f9b3a: Clean up support library samples.
* commit '6b3f9b3ac9327d22e73f4aa2b61e4fb6c3933a33':
  Clean up support library samples.
2011-03-09 18:02:59 -08:00
Dianne Hackborn
6b3f9b3ac9 Clean up support library samples.
Move them off into their own directory, so it is less confusing to
find them.

Also put in some additional samples -- throttle and arguments.

And add some docs.

Change-Id: I221e56c7ff203934796979bb5ed7ab8835f84b83
2011-03-08 18:18:10 -08:00
Jeff Brown
cb34b7c07a Update samples to use new getMotionRanges() API.
Change-Id: I6b67b7cd1f739b5b52ac32745f52bf0a092480a0
2011-03-08 17:35:22 -08:00
Brad Fitzpatrick
9f06e429ed am 6ecf30f2: Merge "Fix SpareParts crash going into battery stats."
* commit '6ecf30f2d8707de4c71272949afc2e6e6818e715':
  Fix SpareParts crash going into battery stats.
2011-03-07 10:46:41 -08:00
Brad Fitzpatrick
6ecf30f2d8 Merge "Fix SpareParts crash going into battery stats." 2011-03-04 13:50:59 -08:00
Daniel Sandler
cc6e41a445 am f6ab64af: Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1
* commit 'f6ab64affe8cbd1ab8c163635faa557be58a207a':
  Restore CAMERA permission to ApiDemos.
2011-03-04 11:07:51 -08:00
Daniel Sandler
f6ab64affe Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1 2011-03-04 10:42:15 -08:00
Daniel Sandler
6044514d0d Restore CAMERA permission to ApiDemos.
Bug: 3512448
Change-Id: I6a80e7f0f9406e084fec9b626abb19cb24b4fe3d
2011-03-04 10:38:04 -05:00
Dianne Hackborn
277fd9adf7 am af3c92d5: Merge "New API demo showing arguments to fragments." into honeycomb-mr1
* commit 'af3c92d5016bd43c88d0a70d6f43ec7573ec1087':
  New API demo showing arguments to fragments.
2011-03-04 00:15:01 -08:00
Andy Stadler
81d4216b79 am 04631234: Add emailcommon to classpath
* commit '04631234e920ccae612ac1ef39cf115931701030':
  Add emailcommon to classpath
2011-03-04 00:14:59 -08:00
Dianne Hackborn
af3c92d501 Merge "New API demo showing arguments to fragments." into honeycomb-mr1 2011-03-03 22:23:17 -08:00
Dianne Hackborn
7f308f27bf New API demo showing arguments to fragments.
Change-Id: I5bc41bb23b7ac6a6d7cbbd08cec67879dc4ae2fe
2011-03-03 22:20:11 -08:00
Ed Heyl
2e9c678537 Merge branch 'master' into honeycomb-plus-aosp 2011-03-03 21:48:48 -08:00
Dan Morrill
a773a80f18 NDEF Push Protocol spec PDF
Change-Id: I1fcf74d8179bfeff206441b45c7b8327a89d4351
2011-03-03 21:35:39 -08:00
Andy Stadler
04631234e9 Add emailcommon to classpath
Change-Id: Ia7ebfbc1c154883f9ace40ce5060a85cf471eaa2
2011-03-03 16:40:26 -08:00
Shih-wei Liao
45e0abddcf Merge "Make AndroidManifest.xml's activity match what's in Java files" 2011-03-02 21:26:25 -08:00
Ying Wang
f566bf1d88 Merge "Add android-support-v4.jar to sdk." 2011-03-02 21:22:59 -08:00
Kenny Root
f57cc7f77b Merge "Switch demo to use new delete observer" 2011-03-02 08:50:46 -08:00
Shih-wei Liao
7cd58489c9 Make AndroidManifest.xml's activity match what's in Java files
Change-Id: I9489d32a715a1aa7f8449495b7c1101a1ad1eac6
2011-03-01 18:21:44 -08:00
Ying Wang
d46eaa6f76 Add android-support-v4.jar to sdk.
Change-Id: I28d2a323d31df6b405548e0c73c616eb7b69753d
2011-03-01 17:14:05 -08:00
Xavier Ducrohet
add79697c8 Merge "Add readme to ApiDemos to mention the need for android-support-v4" 2011-03-01 16:45:04 -08:00
Xavier Ducrohet
86eecf0074 Add readme to ApiDemos to mention the need for android-support-v4
Change-Id: I3172f4644d41fe1358fd5ae327af03e54e1297b5
2011-03-01 16:32:51 -08:00
Xavier Ducrohet
7aa1c11e67 Fix SDK build.
Change-Id: I214048d331c0c9d3885983e588e9313dd3722346
2011-03-01 14:20:35 -08:00
Xavier Ducrohet
e488b3ef67 Put back jar file into compatibility package.
Change-Id: I437d3ba7b6fae13815e34a741adadac8e6ecd8f1
2011-03-01 12:07:04 -08:00
Xavier Ducrohet
281818d994 Merge "Fix build by using $(DIST_DIR)" 2011-03-01 11:10:34 -08:00
Xavier Ducrohet
51920ee661 Fix build by using $(DIST_DIR)
Change-Id: I68832ee411fcafa171354c8b06b0992c8f01cd4d
2011-03-01 11:10:02 -08:00
Brad Fitzpatrick
8832d812d5 Fix SpareParts crash going into battery stats.
Change-Id: Ib158b811c291285660be6fb35ec0f75c429fcea4
http://code.google.com/p/android/issues/detail?id=14898
2011-03-01 10:23:05 -08:00
Kenny Root
f9b8546aca Switch demo to use new delete observer
PackageBrowser had a delete observer that needed to be changed

Change-Id: Ie0082b9af7a14d7d48f8ae64bee42e4c8fb214d7
2011-03-01 09:36:56 -08:00
Andy Stadler
07df538442 Merge "Refresh eclipse classpath" 2011-02-28 17:10:31 -08:00
Andy Stadler
db8cdb8218 Refresh eclipse classpath
* email intermediates moved to JAVA_LIBRARIES
* added android-support library

Change-Id: I9cc985f00f352547c29f2ac171e1ab03bc51a253
2011-02-28 17:07:45 -08:00
Xavier Ducrohet
a48db378fe Merge "Package compatibility component." 2011-02-28 16:02:13 -08:00