Hristo Bojinov
b110304662
Merge "Increase the Retouch buffer size."
2010-08-12 11:44:49 -07:00
Ben Murdoch
ae18f064df
Increase the Retouch buffer size.
...
New WebKit merge built with JSC javascript engine triggers the
overflow.
Change-Id: I71a9bbc9b27c9a0e7f3680f20be2696f61c3b266
2010-08-12 12:45:27 +01:00
Ben Dodson
70748bb17f
Fix for heap size in apicheck
...
Change-Id: Id2efffef3e81464994c3788d1d0bc69c60bc6456
2010-08-11 14:08:28 -07:00
Ben Dodson
6629a4a08e
Merge "Use doclava for apicheck"
2010-08-11 09:27:05 -07:00
Hung-ying Tyan
9904ec2429
am d81e9f88
: am ddefdef5
: Make ProGuard keep necessary members for serializable classes
...
Merge commit 'd81e9f88f4576dd8b18143f0a0d5f50c3758202b'
* commit 'd81e9f88f4576dd8b18143f0a0d5f50c3758202b':
Make ProGuard keep necessary members for serializable classes
2010-08-10 17:54:32 -07:00
Hung-ying Tyan
d81e9f88f4
am ddefdef5
: Make ProGuard keep necessary members for serializable classes
...
Merge commit 'ddefdef5bc560d95f799993759c22ddc02e61b49' into gingerbread-plus-aosp
* commit 'ddefdef5bc560d95f799993759c22ddc02e61b49':
Make ProGuard keep necessary members for serializable classes
2010-08-10 17:50:28 -07:00
Hung-ying Tyan
ddefdef5bc
Make ProGuard keep necessary members for serializable classes
...
Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193
2010-08-11 08:24:46 +08:00
Ben Dodson
83019ba39c
Use doclava for apicheck
...
Change-Id: I6a84717cf645e2a27cea9271c444d159c82439c5
2010-08-10 16:01:36 -07:00
Jean-Baptiste Queru
7cf1214093
Use all known locales in full build
...
Also use more audio files
Change-Id: Iab42123239c30012b0d918b5a4b484b5fc878faf
2010-08-10 09:51:47 -07:00
Ben Dodson
78a24ab2a5
Merge "Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava "
2010-08-06 10:09:46 -07:00
Chung-yih Wang
2d9798cf88
resolved conflicts for merge of 9b7ebf5d
to master
...
Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
2010-08-06 10:48:53 +08:00
Chung-yih Wang
9b7ebf5dbd
am 1a2649f0
: Merge "Add voip(SIP related codes) into framework." into gingerbread
...
Merge commit '1a2649f0da35218748db5aa02c9969246a714b8f' into gingerbread-plus-aosp
* commit '1a2649f0da35218748db5aa02c9969246a714b8f':
Add voip(SIP related codes) into framework.
2010-08-05 19:37:54 -07:00
Chung-yih Wang
1a2649f0da
Merge "Add voip(SIP related codes) into framework." into gingerbread
2010-08-05 19:35:35 -07:00
Dima Zavin
6d98f5f4d6
core: fix paths to libm arch-specific include dirs
...
Change-Id: I17a1ed13af6d4955a636ad429917b683ac59a947
Signed-off-by: Dima Zavin <dima@android.com>
2010-08-05 17:46:53 -07:00
Ben Dodson
1034455a24
Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava
...
Change-Id: If317bd108043b152d28babc88a7c949db5127a93
2010-08-05 15:45:10 -07:00
Scott Main
cecf0bee67
am 240782f2
: am 6eea9363
: am 4f2436dc
: update carousel icon for nexus one dev phone
...
Merge commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3'
* commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3':
update carousel icon for nexus one dev phone
2010-08-05 15:25:15 -07:00
Scott Main
aee274ed4e
am b7256fd6
: am be4696e0
: am 7589398c
: Merge "Doc change: Add nexus one to dev phones image." into froyo
...
Merge commit 'b7256fd6851d90c088b8cc1603fa62faa95714de'
* commit 'b7256fd6851d90c088b8cc1603fa62faa95714de':
Doc change: Add nexus one to dev phones image.
2010-08-05 15:25:12 -07:00
Scott Main
240782f2bd
am 6eea9363
: am 4f2436dc
: update carousel icon for nexus one dev phone
...
Merge commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6' into gingerbread-plus-aosp
* commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6':
update carousel icon for nexus one dev phone
2010-08-05 15:18:06 -07:00
Scott Main
b7256fd685
am be4696e0
: am 7589398c
: Merge "Doc change: Add nexus one to dev phones image." into froyo
...
Merge commit 'be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp
* commit 'be4696e073b93e0e65f767e77166a08efd67c6cb':
Doc change: Add nexus one to dev phones image.
2010-08-05 15:18:03 -07:00
Scott Main
6eea9363f4
am 4f2436dc
: update carousel icon for nexus one dev phone
...
Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread
* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
update carousel icon for nexus one dev phone
2010-08-05 15:10:05 -07:00
Scott Main
be4696e073
am 7589398c
: Merge "Doc change: Add nexus one to dev phones image." into froyo
...
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread
* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
Doc change: Add nexus one to dev phones image.
2010-08-05 15:10:03 -07:00
Ying Wang
ad8704b94f
Merge "Now slang supports multiple rs files in a single run."
2010-08-05 14:14:46 -07:00
Ying Wang
ebfddaa55b
Now slang supports multiple rs files in a single run.
...
Change-Id: I26be766614ee3542d76471e3fc55f485ac65bdee
2010-08-05 12:54:30 -07:00
Brian Carlstrom
de3f74705a
am f9be4330
: am 7dc35a3b
: Tracking merge of dalvik-dev to gingerbread
...
Merge commit 'f9be43305a74fc1c8123cb4eb5c74347acce8a13'
* commit 'f9be43305a74fc1c8123cb4eb5c74347acce8a13':
Tracking merge of dalvik-dev to gingerbread
2010-08-05 12:13:01 -07:00
Thomas Tuttle
0307939fe1
libublock: Remove from prelink-linux-arm.map (no longer prelinked)
...
Change-Id: I0415c138e7c05f08bfca7de250fbdbced3e3ab79
2010-08-05 11:49:14 -07:00
Brian Carlstrom
f9be43305a
am 7dc35a3b
: Tracking merge of dalvik-dev to gingerbread
...
Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp
* commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:23 -07:00
Scott Main
4f2436dc35
update carousel icon for nexus one dev phone
...
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
2010-08-05 09:44:47 -07:00
Scott Main
7589398cf9
Merge "Doc change: Add nexus one to dev phones image." into froyo
2010-08-05 08:05:37 -07:00
Brian Carlstrom
7dc35a3b9c
Tracking merge of dalvik-dev to gingerbread
...
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32
Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Chung-yih Wang
ab8ed58c63
Add voip(SIP related codes) into framework.
...
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
2010-08-05 11:31:07 +08:00
Thomas Tuttle
78c32d1c5a
libublock: Add to prelink-linux-arm.map
...
Change-Id: Ie9a4ef8650f22a5146b3a0f0dc049f46199075e9
2010-08-04 17:42:28 -07:00
Colin Cross
48642604fd
Disable CheckSize on ext partitions to fix build
...
Change-Id: I66c67f8bbd84eb9da988b4079ad4c36089c1c930
2010-08-03 22:54:30 -07:00
Colin Cross
24f4413e0e
Merge "Pass partition size to mkuserimg.sh"
2010-08-03 18:46:06 -07:00
Colin Cross
f735129d08
Merge changes I81e84ca0,I6e3a6ba3
...
* changes:
Pass partition sizes to make_ext4fs
Add dependencies on make_ext4fs
2010-08-03 18:45:58 -07:00
Ying Wang
ee81cd931c
Pass partition size to mkuserimg.sh
...
Change-Id: Id6a53d8d552e8ce1bdf83fbb756724454e05e5c8
2010-08-03 18:05:25 -07:00
Colin Cross
e0a40217df
Pass partition sizes to make_ext4fs
...
Change-Id: I81e84ca02e4326989d25f7d43306c56cdc39348c
2010-08-03 14:50:41 -07:00
Colin Cross
9dd4ba88ee
Add dependencies on make_ext4fs
...
Change-Id: I6e3a6ba33fd9e0ce35137f6e2f60d01521af4cb9
2010-08-03 14:50:32 -07:00
Jeff Davidson
513d7a4021
Add tab completion for lunch.
...
Change-Id: I4ddfffe8fe4519665a5a66aa60990f900a9ba80a
2010-08-03 09:39:39 -07:00
Jing Yu
d1f76461c0
Merge "Make arm-linux-androideabi toolchain the default for Android build."
2010-08-02 20:32:42 -07:00
Hristo Bojinov
96be7205dc
Working ASLR implementation.
...
ASLR for shared libraries is controlled by "-a" in ota_from_target_files.
Binary files are self-contained (supported by apriori/soslim).
Signed-off-by: Hristo Bojinov <hristo@google.com>
Change-Id: I500e325bf4a70a8d69a2ab9b2938e83dadb4e65d
2010-08-02 14:25:01 -07:00
Jing Yu
9d396e37ac
Make arm-linux-androideabi toolchain the default for Android build.
...
androideabi target is already in upstream GCC. The arm-linux-
androideabi toolchain can be built directly from upstream GCC.
Switching from old special tailored arm-eabi toolchain to the new
arm-linux-androideabi toolchain make us closer to the opensource
community and friendly to all toolchain developers.
kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain
path to PATH.
The arm-linux-androideabi-4.4.x toolchain is built with the same
source as the latest arm-eabi-4.4.3 toolchain except for the
target change patches.
Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
2010-07-29 19:09:12 -07:00
Ying Wang
778c2b6900
am 33c11ac3
: am e1f37ba0
: am 55edb20e
: Merge "Dist apkcerts.txt for unbundled builds" into froyo
...
Merge commit '33c11ac3f150a388ebf2df80a42b577c136282de'
* commit '33c11ac3f150a388ebf2df80a42b577c136282de':
Dist apkcerts.txt for unbundled builds
2010-07-29 10:32:19 -07:00
Ying Wang
33c11ac3f1
am e1f37ba0
: am 55edb20e
: Merge "Dist apkcerts.txt for unbundled builds" into froyo
...
Merge commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4' into gingerbread-plus-aosp
* commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4':
Dist apkcerts.txt for unbundled builds
2010-07-29 10:30:13 -07:00
Ying Wang
e1f37ba0cf
am 55edb20e
: Merge "Dist apkcerts.txt for unbundled builds" into froyo
...
Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread
* commit '55edb20e246e88afd841f63725c647132d9aca17':
Dist apkcerts.txt for unbundled builds
2010-07-29 10:27:45 -07:00
Ying Wang
55edb20e24
Merge "Dist apkcerts.txt for unbundled builds" into froyo
2010-07-29 10:21:15 -07:00
Xavier Ducrohet
c350a66807
am 45270759
: am e743c53b
: Package ddmlib-prebuilt with CTS.
...
Merge commit '45270759642c03bdbe39ae261e22160d2c64ecec'
* commit '45270759642c03bdbe39ae261e22160d2c64ecec':
Package ddmlib-prebuilt with CTS.
2010-07-28 15:17:09 -07:00
Xavier Ducrohet
4527075964
am e743c53b
: Package ddmlib-prebuilt with CTS.
...
Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp
* commit 'e743c53b88faf35be47667b0252c881c7b32f856':
Package ddmlib-prebuilt with CTS.
2010-07-28 15:14:51 -07:00
Jing Yu
8e06aa9bd6
Merge "Group needed libraries together to solve the cyclic dependence between libc, libc_nomalloc and libgcc. When building with upcoming arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a and defined by libc.a or libc_nomalloc.a.which."
2010-07-28 14:47:15 -07:00
The Android Open Source Project
d12d7367db
am 636e6dec
: am 609fef71
: am 3a0576a4
: merge from open-source froyo
...
Merge commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc'
* commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc':
2010-07-28 11:48:46 -07:00
The Android Open Source Project
636e6dec48
am 609fef71
: am 3a0576a4
: merge from open-source froyo
...
Merge commit '609fef7173a1278cb79d7aefdd22a22547648cab' into gingerbread-plus-aosp
* commit '609fef7173a1278cb79d7aefdd22a22547648cab':
2010-07-28 11:47:24 -07:00