David 'Digit' Turner
de830eddbc
am 62b21b41: am 832388de: am 13a0b81c: Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644"
...
* commit '62b21b41467dd8ebc4ce7518de8f4418389cf436':
Revert 776bd3e46c
2011-04-14 07:42:08 -07:00
David 'Digit' Turner
62b21b4146
am 832388de: am 13a0b81c: Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644"
...
* commit '832388de41c6b44d43bd1f1307b3386d0fcc376e':
Revert 776bd3e46c
2011-04-14 07:39:04 -07:00
David 'Digit' Turner
832388de41
am 13a0b81c: Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644"
...
* commit '13a0b81cdd18151b4bbb4c61a6b7c7a652eca6ed':
Revert 776bd3e46c
2011-04-14 07:32:48 -07:00
David 'Digit' Turner
13a0b81cdd
Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644"
2011-04-14 07:19:30 -07:00
David 'Digit' Turner
a6e54e04a3
Revert 776bd3e46c
...
Unfortunately, we need to keep duplicate libraries under sdk/emulator/
to avoid breaking a few internal branches.
commit 776bd3e46c
Author: David 'Digit' Turner <digit@android.com >
Date: Thu Apr 7 10:58:07 2011 +0200
emulator: Remove the global Make variable trick for emulator-specific system modules.
Remove a sad trick that was used to smoothly move the platform-specific emulator
modules from sdk/emulator/ to development/tools/emulator/system without creating
build conflicts.
Now that the sdk/ modules have been removed, we can get rid of the guard variable.
Change-Id: Id5c44a4160191d8ac9afcbbeeef7de0b9a5b0f6f
2011-04-14 14:06:05 +02:00
David 'Digit' Turner
74ca761b11
am 13e07e5c: am 28eeece2: am 755d75f4: Merge "ndk: Add missing update arm C library for android-9 platform."
...
* commit '13e07e5c66d20c95f7c8dd668f1e7d9d50da2c9c':
ndk: Add missing update arm C library for android-9 platform.
2011-04-14 04:02:18 -07:00
David 'Digit' Turner
13e07e5c66
am 28eeece2: am 755d75f4: Merge "ndk: Add missing update arm C library for android-9 platform."
...
* commit '28eeece2152a6dd78bc630a6a0924ceb6921118a':
ndk: Add missing update arm C library for android-9 platform.
2011-04-14 03:53:59 -07:00
David 'Digit' Turner
28eeece215
am 755d75f4: Merge "ndk: Add missing update arm C library for android-9 platform."
...
* commit '755d75f4a2d2bd360b5d8a92e9a4a9bc01a185e4':
ndk: Add missing update arm C library for android-9 platform.
2011-04-14 03:26:48 -07:00
David 'Digit' Turner
755d75f4a2
Merge "ndk: Add missing update arm C library for android-9 platform."
2011-04-14 03:10:19 -07:00
David 'Digit' Turner
f76679f6ba
ndk: Add missing update arm C library for android-9 platform.
...
The C library was updated in Gingerbread to support. The corresponding
headers were updated, but the change was missing an updated library,
used for proper linking of new functions (e.g. pthread_rwlock_init).
Fix for http://code.google.com/p/android/issues/detail?id=12990
For the record, this binary was simply pulled from an AVD created
with the standard SDK platform image for Gingerbread.
Change-Id: Ic30921582f143adfc4bcfe3f70a6293530fe0202
2011-04-14 11:44:04 +02:00
Brian Carlstrom
a0f49ace44
Merge "Tolerate missing AccountManager resource, not just missing resource name"
2011-04-13 11:13:56 -07:00
Dianne Hackborn
a8693d8b03
Add handling of tasks being removed.
...
Change-Id: I6141f17310e61dc6b86052ca81a17a51cc6a2193
2011-04-12 18:25:38 -07:00
David 'Digit' Turner
773c80fdb1
am ffb13684: am 957b0ebe: am bfdff660: Merge "ndk: x86: Update libc.so and libstdc++.so"
...
* commit 'ffb13684024154fc98c27d32c40c090a4ea82e4e':
ndk: x86: Update libc.so and libstdc++.so
2011-04-11 17:38:17 -07:00
David 'Digit' Turner
ffb1368402
am 957b0ebe: am bfdff660: Merge "ndk: x86: Update libc.so and libstdc++.so"
...
* commit '957b0ebeb15ec37059705558d10ab01505853738':
ndk: x86: Update libc.so and libstdc++.so
2011-04-11 17:32:49 -07:00
David 'Digit' Turner
9d62f6e437
am e40fb554: am 07dfa1b1: am 0ed88818: am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."
...
* commit 'e40fb554a9bbb938fac2277ac965b01e2ef40051':
emulator: Remove the global Make variable trick for emulator-specific system modules.
2011-04-11 17:32:02 -07:00
David 'Digit' Turner
e40fb554a9
am 07dfa1b1: am 0ed88818: am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."
...
* commit '07dfa1b15d8ef2bce114d094d3281421ec6034e2':
emulator: Remove the global Make variable trick for emulator-specific system modules.
2011-04-11 17:26:31 -07:00
David 'Digit' Turner
f02db0b22d
am 929e2f10: am 4fc035aa: am 9909e7f5: am b24b2470: Merge "Really fix the Mac SDK build this time. Doh."
...
* commit '929e2f101620087c3ffbd6c214286c0b1348154b':
Really fix the Mac SDK build this time. Doh.
2011-04-11 14:50:10 -07:00
David 'Digit' Turner
f5b7571291
am 6bd20ca2: am f0f9b1bd: am ca7616f2: am d5106417: Merge "Fix Mac sdk builds"
...
* commit '6bd20ca22a4483cd75eb3e66682ec830d8688852':
Fix Mac sdk builds
2011-04-11 14:50:08 -07:00
David Turner
62ac521c61
am 0f7fe2a2: am 5c0f4ce0: am 5eaaac26: am e8c05eb1: Merge "fix handling pointers in emugen."
...
* commit '0f7fe2a2a0ccc3ba38440e66174184cbb01b889a':
fix handling pointers in emugen.
2011-04-11 14:50:06 -07:00
David Turner
58a12822d4
am 8ce14fd8: am 0c0fd648: am fef11912: am ba43b928: Merge "emulator opengl - directory rearrangment"
...
* commit '8ce14fd8b058d4815c89ae04f0476142a26ec540':
emulator opengl - directory rearrangment
2011-04-11 14:50:02 -07:00
David 'Digit' Turner
929e2f1016
am 4fc035aa: am 9909e7f5: am b24b2470: Merge "Really fix the Mac SDK build this time. Doh."
...
* commit '4fc035aaca64214f4af2425d6b6d68187241b38d':
Really fix the Mac SDK build this time. Doh.
2011-04-11 14:46:51 -07:00
David 'Digit' Turner
6bd20ca22a
am f0f9b1bd: am ca7616f2: am d5106417: Merge "Fix Mac sdk builds"
...
* commit 'f0f9b1bd4010f9584675a83e079e7ab6167bb7ee':
Fix Mac sdk builds
2011-04-11 14:46:37 -07:00
David Turner
0f7fe2a2a0
am 5c0f4ce0: am 5eaaac26: am e8c05eb1: Merge "fix handling pointers in emugen."
...
* commit '5c0f4ce0bede5b1652853e7bc14dcc0e0a98ac5c':
fix handling pointers in emugen.
2011-04-11 14:46:34 -07:00
David Turner
8ce14fd8b0
am 0c0fd648: am fef11912: am ba43b928: Merge "emulator opengl - directory rearrangment"
...
* commit '0c0fd6480c7dfd40de6a0514abd634e481c35f90':
emulator opengl - directory rearrangment
2011-04-11 14:46:27 -07:00
Brian Carlstrom
1dadaee6ce
Tolerate missing AccountManager resource, not just missing resource name
...
Change-Id: I3885d7f8a66868cd2ca5f463d427b891548cf22f
2011-04-08 11:12:58 -07:00
Joe Onorato
1710677cba
Remove the deprecated things from Config.java. These haven't been working since before 1.0.
...
Change-Id: I01e0e2476de9098152434b9991c22483fc6e1165
2011-04-07 19:22:49 -07:00
David 'Digit' Turner
957b0ebeb1
am bfdff660: Merge "ndk: x86: Update libc.so and libstdc++.so"
...
* commit 'bfdff660a66eda206e1f289d56a2e335f65a9398':
ndk: x86: Update libc.so and libstdc++.so
2011-04-07 13:04:17 -07:00
David 'Digit' Turner
bfdff660a6
Merge "ndk: x86: Update libc.so and libstdc++.so"
2011-04-07 12:42:29 -07:00
David 'Digit' Turner
7e9db3d22b
ndk: x86: Update libc.so and libstdc++.so
...
This patch updates the system C and C++ libraries used for
the x86 ABI. We remove the old binary targetting API level 5
(Eclair) since we don't support x86 on it anyway, and put new ones
generated from the AOSP tree with the full_x86-eng build product.
This is necessary to be able to prebuild STLport binaries for
the x86 NDK.
The binaries corresponding to the AOSP platform/bionic.git tree
using the following SHA-1, when building full_x86-eng:
4c090434a4fcffb3a8bb7ebee7cc6e52befceeae
Change-Id: I63c71554c655f18a6a6f9135074792a8681098bb
2011-04-07 17:22:28 +02:00
David 'Digit' Turner
07dfa1b15d
am 0ed88818: am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."
...
* commit '0ed888186a59454ff074a53ff8ea0458d8e0fc46':
emulator: Remove the global Make variable trick for emulator-specific system modules.
2011-04-07 02:33:43 -07:00
David 'Digit' Turner
0ed888186a
am cecd02c1: Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."
...
* commit 'cecd02c1ba1180b774063d779f89a18bce78f029':
emulator: Remove the global Make variable trick for emulator-specific system modules.
2011-04-07 02:18:54 -07:00
David 'Digit' Turner
cecd02c1ba
Merge "emulator: Remove the global Make variable trick for emulator-specific system modules."
2011-04-07 02:00:40 -07:00
David 'Digit' Turner
776bd3e46c
emulator: Remove the global Make variable trick for emulator-specific system modules.
...
Remove a sad trick that was used to smoothly move the platform-specific emulator
modules from sdk/emulator/ to development/tools/emulator/system without creating
build conflicts.
Now that the sdk/ modules have been removed, we can get rid of the guard variable.
Change-Id: I0261fcd6cdf6af7564106c5ab8d2b3bda001d567
2011-04-07 10:58:07 +02:00
Chih-Chung Chang
848dcf58f9
Change from old Gallery3D to new GalleryNew3D.
...
Change-Id: Idab5e91c7f126851f7bc6e89cd5eb662eaedb907
2011-04-07 16:01:29 +08:00
Joe Onorato
0b980dd0e5
Moving spare parts to its own project.
...
Change-Id: I77a6b5f355b1750dfa7dfa6a3e21371a6769f4c4
2011-04-06 14:05:14 -07:00
Dianne Hackborn
59e35f1972
Add API demo for new -wNNNdp and -hNNNdp configs.
...
Change-Id: I3c0e53f4007c5a486855346b2b7221ce4f2739c3
2011-04-06 12:38:11 -07:00
Dianne Hackborn
38eafa95f7
New API demo for the support library FragmentPager class.
...
Change-Id: I3da4c9fe83cac48054f1efaa40b1f57f68402faa
2011-04-05 11:04:34 -07:00
David 'Digit' Turner
4fc035aaca
am 9909e7f5: am b24b2470: Merge "Really fix the Mac SDK build this time. Doh."
...
* commit '9909e7f566a2284fd32e359d1ed8aea982b6f5ab':
Really fix the Mac SDK build this time. Doh.
2011-04-05 08:39:25 -07:00
David 'Digit' Turner
9909e7f566
am b24b2470: Merge "Really fix the Mac SDK build this time. Doh."
...
* commit 'b24b247080a89bed65953ed6d49b65c9b5270d18':
Really fix the Mac SDK build this time. Doh.
2011-04-05 08:37:13 -07:00
David 'Digit' Turner
b24b247080
Merge "Really fix the Mac SDK build this time. Doh."
2011-04-05 08:26:20 -07:00
David 'Digit' Turner
45c722023d
Really fix the Mac SDK build this time. Doh.
...
Change-Id: I529c42f89e752b245f76d7ea0d55ad6c676936b0
2011-04-05 17:23:55 +02:00
David 'Digit' Turner
f0f9b1bd40
am ca7616f2: am d5106417: Merge "Fix Mac sdk builds"
...
* commit 'ca7616f21d51faef34771351caffc3d00c2579dd':
Fix Mac sdk builds
2011-04-05 07:35:04 -07:00
David Turner
5c0f4ce0be
am 5eaaac26: am e8c05eb1: Merge "fix handling pointers in emugen."
...
* commit '5eaaac26e2ff3e1b09fe5d725f47442bda71779d':
fix handling pointers in emugen.
2011-04-05 07:35:02 -07:00
David 'Digit' Turner
ca7616f21d
am d5106417: Merge "Fix Mac sdk builds"
...
* commit 'd510641759d0cd769bc2bb397db001a6bd656617':
Fix Mac sdk builds
2011-04-05 06:45:36 -07:00
David 'Digit' Turner
d510641759
Merge "Fix Mac sdk builds"
2011-04-05 06:39:19 -07:00
David 'Digit' Turner
c29456a000
Fix Mac sdk builds
...
Change-Id: Ia90be6b2ef10520ab2efb70fc03332a36e531ddc
2011-04-05 15:37:31 +02:00
David Turner
5eaaac26e2
am e8c05eb1: Merge "fix handling pointers in emugen."
...
* commit 'e8c05eb11a966887daa96dab64aea40c4862775c':
fix handling pointers in emugen.
2011-04-05 06:06:48 -07:00
David Turner
0c0fd6480c
am fef11912: am ba43b928: Merge "emulator opengl - directory rearrangment"
...
* commit 'fef11912975311ce706a25eb28f71ba78e4a8300':
emulator opengl - directory rearrangment
2011-04-05 06:05:50 -07:00
David Turner
e8c05eb11a
Merge "fix handling pointers in emugen."
2011-04-05 05:59:55 -07:00
David Turner
fef1191297
am ba43b928: Merge "emulator opengl - directory rearrangment"
...
* commit 'ba43b928e6de8100c8feea75383dd89b1207c3c1':
emulator opengl - directory rearrangment
2011-04-05 05:51:49 -07:00