Xavier Ducrohet
024201a3b3
am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1
...
* commit 'a205c3ad2a8102d8ba681ad358cd3470bc237be6':
Add eclipse+readme files to prebuilt of v7-grid. do not merge.
2012-03-16 09:42:25 -07:00
Xavier Ducrohet
9c583814c7
am a205c3ad: Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1
...
* commit 'a205c3ad2a8102d8ba681ad358cd3470bc237be6':
Add eclipse+readme files to prebuilt of v7-grid. do not merge.
2012-03-16 09:42:21 -07:00
Xavier Ducrohet
a205c3ad2a
Merge "Add eclipse+readme files to prebuilt of v7-grid. do not merge." into ics-mr1
2012-03-16 09:40:37 -07:00
Xavier Ducrohet
65b242b151
Add eclipse+readme files to prebuilt of v7-grid. do not merge.
...
Change-Id: Ife58a0f2abf8ee13c2973ff57b2aaedfd9d78d59
2012-03-16 09:39:57 -07:00
Raghu Gandham
c06e37eb51
ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and
...
INT_MIN. Without this fix, the following lines will fail when configuring
gnu stdlibc++ library. (INT_MAX and INT_MIN are undefined.)
#define WCHAR_MAX INT_MAX
#define WCHAR_MIN INT_MIN
Change-Id: Ifa87cf011cf7068c48755fc9ce5c0d73e95ef2dc
Signed-off-by: Chao-Ying Fu <fu@mips.com >
2012-03-15 17:24:23 -07:00
Robert Ly
bdbb021a70
am 9ef633a0: am 38eb1f7f: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
...
* commit '9ef633a0ffdc33ad8c3b2f0466f405a5b32438ad':
2012-03-15 11:38:40 -07:00
Robert Ly
9ea82e9931
am 28744c34: am b7875ba1: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
...
* commit '28744c34992d2f8619b08536336d0e1401a9fb56':
update searchable dictionary for Android U class
2012-03-15 11:38:39 -07:00
Robert Ly
e444fb9888
am f9398a3a: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
...
* commit 'f9398a3a77abe2c3172629fc7d91bd89bc4a3e80':
update searchable dictionary for Android U class
2012-03-14 18:44:26 -07:00
Robert Ly
9ef633a0ff
am 38eb1f7f: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
...
* commit '38eb1f7fa4519d55da1d013a2db790eff425fd89':
2012-03-14 15:47:31 -07:00
Robert Ly
28744c3499
am b7875ba1: am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
...
* commit 'b7875ba1d5497a264b2d73b2d0f40931a8894828':
update searchable dictionary for Android U class
2012-03-14 15:46:39 -07:00
Robert Ly
38eb1f7fa4
am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
...
* commit '6630bfd9ac3df7ee11c3b8e9abd4c1ee2b58fc17':
update searchable dictionary for Android U class
2012-03-14 15:43:18 -07:00
Robert Ly
f9398a3a77
am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
...
* commit '6630bfd9ac3df7ee11c3b8e9abd4c1ee2b58fc17':
update searchable dictionary for Android U class
2012-03-14 15:43:10 -07:00
Robert Ly
b7875ba1d5
am 6630bfd9: Merge "update searchable dictionary for Android U class" into ics-mr1
...
* commit '6630bfd9ac3df7ee11c3b8e9abd4c1ee2b58fc17':
update searchable dictionary for Android U class
2012-03-14 15:43:03 -07:00
Robert Ly
6630bfd9ac
Merge "update searchable dictionary for Android U class" into ics-mr1
2012-03-14 15:40:41 -07:00
Dianne Hackborn
51cb3a4dbc
Update to follow IActivityManager change.
...
Change-Id: I1e02418be7e6c2777662c0b4ba99b7b68c37834a
2012-03-14 12:57:15 -07:00
Andrew Hsieh
129a0c2963
Merge "Added rules to build 64-bit libraries for 64-bit emulator"
2012-03-14 09:13:15 -07:00
Andrew Hsieh
a3f456f459
Added rules to build 64-bit libraries for 64-bit emulator
...
All ten libraries can now be built in 64-bit named "lib64*" (*)
in addition to the original 32-bit form named "lib*".
Also, dlopen "lib64*so" in 64-bit.
(*) eg. In Ubuntu, all can be built with the following command:
make out/host/linux-x86/lib/lib64OpenglRender.so \
out/host/linux-x86/lib/lib64EGL_translator.so \
out/host/linux-x86/lib/lib64GLES_CM_translator.so \
out/host/linux-x86/lib/lib64GLES_V2_translator.so
Rules to build static libraries lib64log.a, lib64cutils.a and lib64utils.a
they depend were added in other CLs.
Change-Id: I3afb64de6dda1d55dbd1b4443d2dbc78a683b19f
2012-03-13 22:40:33 -07:00
Robert Ly
7d5b68ca79
update searchable dictionary for Android U class
...
Change-Id: Ib214400bae29ab2c4a34500dcf84b415ab13b77c
2012-03-13 15:23:35 -07:00
James Dong
7803a1db5b
Merge "Switched to use header files in /frameworks/native"
2012-03-13 12:44:43 -07:00
Raphael Moll
49d8d82cec
am 6f721123: (-s ours) am af574136: Support lib: use /samples directory. do not merge.
...
* commit '6f721123f05bf6a8dee29db251a64f19a5d5821e':
Support lib: use /samples directory. do not merge.
2012-03-13 11:34:29 -07:00
Andreas Huber
bd7ef3835c
Merge "We're configuring media codecs dynamically now."
2012-03-13 09:01:32 -07:00
David 'Digit' Turner
c65cfeb2b2
ndk: <signal.h>: include <asm/sigcontext.h>
...
This patch modifies <signal.h>, starting from API level 8,
to include <asm/sigcontext.h>.
It is required to be able to use <signal.h> on a MIPS
platform. See https://android-review.googlesource.com/32281
Change-Id: I720259541fa7e2a4d6a428eae9fd4882c5355c31
2012-03-13 13:49:02 +01:00
James Dong
27b71c7383
Switched to use header files in /frameworks/native
...
o related-to-bug: 6044887
Change-Id: Iea98db35e51aaf52063565818ecfea8a935693f3
2012-03-12 20:37:02 -07:00
The Android Automerger
385258187c
merge in ics-mr1-release history after reset to ics-mr1
2012-03-12 19:31:42 -07:00
Siva Velusamy
c8193f2412
Merge "Fix # of arguments to startActivity"
2012-03-12 18:10:44 -07:00
Brian Muramatsu
55f81591b9
Merge "Fixes for runtest"
2012-03-12 14:42:25 -07:00
Raphael Moll
add6f71e75
am d42bec86: (-s ours) am 8ff88c36: am af574136: Support lib: use /samples directory. do not merge.
...
* commit 'd42bec86ddf296f2d9b4df059dbaaeceea7a8d3d':
2012-03-12 13:02:33 -07:00
Raphael Moll
90ea721e46
am bc86d238: (-s ours) am a4c2cb77: am af574136: Support lib: use /samples directory. do not merge.
...
* commit 'bc86d23849ed54e0c934765eecd4d88bcb059a60':
Support lib: use /samples directory. do not merge.
2012-03-12 13:02:33 -07:00
Raphael Moll
d42bec86dd
am 8ff88c36: am af574136: Support lib: use /samples directory. do not merge.
...
* commit '8ff88c3672461260d1c3b255714d701aec1bfac2':
2012-03-12 12:32:24 -07:00
Raphael Moll
bc86d23849
am a4c2cb77: am af574136: Support lib: use /samples directory. do not merge.
...
* commit 'a4c2cb77b51bc2b2faa615e8a6bfa20f24998269':
Support lib: use /samples directory. do not merge.
2012-03-12 12:32:04 -07:00
Raphael Moll
a4c2cb77b5
am af574136: Support lib: use /samples directory. do not merge.
...
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
Support lib: use /samples directory. do not merge.
2012-03-12 12:30:20 -07:00
Raphael Moll
8ff88c3672
am af574136: Support lib: use /samples directory. do not merge.
...
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
Support lib: use /samples directory. do not merge.
2012-03-12 12:29:59 -07:00
Raphael Moll
6f721123f0
am af574136: Support lib: use /samples directory. do not merge.
...
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
Support lib: use /samples directory. do not merge.
2012-03-12 12:29:47 -07:00
Raphael Moll
af57413607
Support lib: use /samples directory. do not merge.
...
This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.
Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/
(Cherry-pick from 913d903aa2 )
Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
2012-03-12 12:27:02 -07:00
Raphael Moll
913d903aa2
Support lib: use /samples directory.
...
This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.
Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/
Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
2012-03-12 11:33:18 -07:00
The Android Automerger
5396ffc7a9
merge in ics-mr1-release history after reset to ics-mr1
2012-03-10 09:06:40 -08:00
The Android Automerger
1f0ab0347f
merge in ics-mr1-release history after reset to ics-mr1
2012-03-09 19:23:06 -08:00
Siva Velusamy
fd4a73989f
Fix # of arguments to startActivity
...
Change-Id: I01daa8efe56d6a8ba0d35f63290d50281d4723eb
2012-03-09 14:35:44 -08:00
Ying Wang
438a4112b3
Merge "Add framework/native to fix build."
2012-03-09 10:22:13 -08:00
Ying Wang
06f3f54fc0
Add framework/native to fix build.
...
No framework/native is split out from framework/base.
Change-Id: I3b596a98feee01f433fa0e88d81d780315a3ebb8
2012-03-09 10:04:22 -08:00
Ed Heyl
35c941e726
Merge "Minor makefile tweak to compile with elfutils-0.138"
2012-03-09 09:48:10 -08:00
Mathias Agopian
d069948a49
update Eclipse include paths
...
Change-Id: Ia73ff3cc256ac0daaf3095441f595e271bc6c44e
2012-03-08 21:05:49 -08:00
Mathias Agopian
cc3332aac7
remove dependency on apparently uneeded libs. might fix sdk build
...
Change-Id: I78cb49456ccf8bc6df3ebdd76ae63e0b0b6d7e4b
2012-03-08 21:02:36 -08:00
The Android Automerger
3d17b9896f
merge in ics-mr1-release history after reset to ics-mr1
2012-03-08 20:43:39 -08:00
Ben Cheng
e35bfe51a1
Minor makefile tweak to compile with elfutils-0.138
...
Explicitly specify that this module is only built on linux-x86 and
darwin-x86
Change-Id: I2dba02b25c655af114417fc222a697e4d5294602
2012-03-08 16:14:35 -08:00
Megha Joshi
b1a2cd42eb
am 4b46b075: am ca2728fe: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
...
* commit '4b46b0756f1a296f2e14c5ae8d6c701ef5cbf51e':
2012-03-08 12:29:13 -08:00
Megha Joshi
7abd0794f4
am 8288333b: am 3174fec7: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
...
* commit '8288333b0a7d7741631066d11e65dd01d43c9a77':
Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
2012-03-08 12:26:38 -08:00
Megha Joshi
4b46b0756f
am ca2728fe: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
...
* commit 'ca2728fe1f4a2592d5cb780ccf8cc756494a8752':
2012-03-08 12:25:32 -08:00
Megha Joshi
92039ecc6a
am 5989a5de: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
...
* commit '5989a5de5b69c5d0211004786f52044382a751cf':
Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
2012-03-08 12:24:17 -08:00
Megha Joshi
8288333b0a
am 3174fec7: am 27a6a0f0: Merge "Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well." into ics-mr1
...
* commit '3174fec75f73b92fdaac2958e3cf0c4b6be6a562':
Adding values-large-land and values-large-port folders. This is so that I can replace xlarge with large in training/multiscreen/screensizes.html for it to be compatible with TVs as well.
2012-03-08 12:24:14 -08:00