OSDN Git Service
Ben Dodson [Tue, 24 Aug 2010 22:34:36 +0000 (15:34 -0700)]
Merge "Adding android-specific customization for warning of minimum api level"
Ying Wang [Tue, 24 Aug 2010 22:20:47 +0000 (15:20 -0700)]
am
567ec8ed: (-s ours) am
ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Merge commit '
567ec8ede3e7cda75c1f3d474d14d78b12a6765f'
* commit '
567ec8ede3e7cda75c1f3d474d14d78b12a6765f':
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Ben Dodson [Tue, 24 Aug 2010 21:39:58 +0000 (14:39 -0700)]
Adding android-specific customization for warning of minimum api level
Change-Id: Id211e250f3c42d0239ce9bf126a74997c8b0dc3f
Jean-Baptiste Queru [Tue, 24 Aug 2010 18:55:05 +0000 (11:55 -0700)]
am
b4df3489: am
34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
b4df348997795f2e60476ca4b67f9fe5501321db'
* commit '
b4df348997795f2e60476ca4b67f9fe5501321db':
FRG51
FRG49
bump version from 2.2 to 2.2.1 for next froyo release
FRG22D
FRG22C
FRG22B
33b special
FRG33
FRG22
FRG15B
FRG15
FRG01B
FRG08
FRG01
FRF81
Ying Wang [Tue, 24 Aug 2010 18:50:46 +0000 (11:50 -0700)]
am
ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Merge commit '
ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51' into gingerbread-plus-aosp
* commit '
ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51':
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Ying Wang [Tue, 24 Aug 2010 18:21:27 +0000 (11:21 -0700)]
am
2eed660c: am
ffff0028: Pass pagesize to makebootimage.
Merge commit '
2eed660c667550f1b810303b13ee0c7e84455bf0'
* commit '
2eed660c667550f1b810303b13ee0c7e84455bf0':
Pass pagesize to makebootimage.
Ying Wang [Tue, 24 Aug 2010 18:20:45 +0000 (11:20 -0700)]
am
d3b973d8: (-s ours) am
065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '
d3b973d8970bcbeab3fd27a070e7373b2fa36072'
* commit '
d3b973d8970bcbeab3fd27a070e7373b2fa36072':
Backport ext4 support from master [DO NOT MERGE]
Ying Wang [Tue, 24 Aug 2010 18:18:07 +0000 (11:18 -0700)]
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Original CL: 59920
Change-Id: I81437996670a61e10284293d25a08da8907ad296
Ying Wang [Tue, 24 Aug 2010 18:02:12 +0000 (11:02 -0700)]
am
d4ee2de1: (-s ours) am
ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
Merge commit '
d4ee2de1c3b5163926d40879277e6e35ea40924c'
* commit '
d4ee2de1c3b5163926d40879277e6e35ea40924c':
Restore OTA for crespo. [DO NOT MERGE]
Jean-Baptiste Queru [Tue, 24 Aug 2010 18:01:21 +0000 (11:01 -0700)]
am
ed91928a: (-s ours) am
60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
Merge commit '
ed91928a6ca817a9a133ee81cfb2e9745acec21d'
* commit '
ed91928a6ca817a9a133ee81cfb2e9745acec21d':
Better way to disable OTAs for crespo - DO NOT MERGE
Ying Wang [Tue, 24 Aug 2010 17:16:51 +0000 (10:16 -0700)]
am
13a019fe: (-s ours) am
7daa9132: Disable OTA for crespo [DO NOT MERGE]
Merge commit '
13a019fe32e6a0eb3289ad6142173631ac601391'
* commit '
13a019fe32e6a0eb3289ad6142173631ac601391':
Disable OTA for crespo [DO NOT MERGE]
Jean-Baptiste Queru [Tue, 24 Aug 2010 06:36:16 +0000 (23:36 -0700)]
am
34acfcf6: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
34acfcf6858fa4c9183d4e4d2e10f15cf932285f' into gingerbread-plus-aosp
* commit '
34acfcf6858fa4c9183d4e4d2e10f15cf932285f':
FRG51
FRG49
bump version from 2.2 to 2.2.1 for next froyo release
FRG22D
FRG22C
FRG22B
33b special
FRG33
FRG22
FRG15B
FRG15
FRG01B
FRG08
FRG01
FRF81
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:07:41 +0000 (19:07 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: Ic1040aa7e00cdc01af2f2cb4c741bafe4936904c
Ying Wang [Mon, 23 Aug 2010 20:52:18 +0000 (13:52 -0700)]
am
ffff0028: Pass pagesize to makebootimage.
Merge commit '
ffff0028ae9a83893f71efa370d283e2247bcdd4' into gingerbread-plus-aosp
* commit '
ffff0028ae9a83893f71efa370d283e2247bcdd4':
Pass pagesize to makebootimage.
Ying Wang [Mon, 23 Aug 2010 19:56:25 +0000 (12:56 -0700)]
Pass pagesize to makebootimage.
Change-Id: I719d765245469921de105430fdd92d478ea48e82
Ying Wang [Mon, 23 Aug 2010 18:49:10 +0000 (11:49 -0700)]
am
065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '
065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp
* commit '
065521be4fd6965058fbd599bb43fe13101fee7c':
Backport ext4 support from master [DO NOT MERGE]
Ying Wang [Mon, 23 Aug 2010 18:34:40 +0000 (11:34 -0700)]
Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.
Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
Ying Wang [Sun, 22 Aug 2010 00:00:59 +0000 (17:00 -0700)]
am
ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
Merge commit '
ad3cf5f868fc36de0a4fa501f074d35a94496b27' into gingerbread-plus-aosp
* commit '
ad3cf5f868fc36de0a4fa501f074d35a94496b27':
Restore OTA for crespo. [DO NOT MERGE]
Ying Wang [Sat, 21 Aug 2010 23:49:07 +0000 (16:49 -0700)]
Restore OTA for crespo. [DO NOT MERGE]
Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
Jean-Baptiste Queru [Sat, 21 Aug 2010 02:22:51 +0000 (19:22 -0700)]
am
60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
Merge commit '
60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp
* commit '
60d1ee3e539e02ba701b9ff647fd23aca18f890d':
Better way to disable OTAs for crespo - DO NOT MERGE
Jean-Baptiste Queru [Sat, 21 Aug 2010 02:19:00 +0000 (19:19 -0700)]
Better way to disable OTAs for crespo - DO NOT MERGE
OTAs need to be disabled for all products using crespo
hardware, not just a single one.
Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
Ying Wang [Sat, 21 Aug 2010 00:13:56 +0000 (17:13 -0700)]
am
7daa9132: Disable OTA for crespo [DO NOT MERGE]
Merge commit '
7daa91323139fa7c0435a07b0e3fad6056d0954b' into gingerbread-plus-aosp
* commit '
7daa91323139fa7c0435a07b0e3fad6056d0954b':
Disable OTA for crespo [DO NOT MERGE]
Ying Wang [Fri, 20 Aug 2010 23:45:19 +0000 (16:45 -0700)]
Disable OTA for crespo [DO NOT MERGE]
Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f
android-build SharedAccount [Fri, 20 Aug 2010 16:21:16 +0000 (09:21 -0700)]
FRG51
Change-Id: Ifa272e3b63d85a5b25a43e3869fea4e62ea0d037
android-build SharedAccount [Fri, 20 Aug 2010 06:42:00 +0000 (23:42 -0700)]
am
ba509c8d: am
c434bbbb: am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
ba509c8db0b00fdc9143459b0d9fefb2c25a5861'
* commit '
ba509c8db0b00fdc9143459b0d9fefb2c25a5861':
bump version from 2.2 to 2.2.1 for next froyo release
Ying Wang [Thu, 19 Aug 2010 03:32:28 +0000 (20:32 -0700)]
Merge "Fix dependency."
Ying Wang [Thu, 19 Aug 2010 03:30:52 +0000 (20:30 -0700)]
Fix dependency.
Compile renderscript before building the package-export.apk.
Change-Id: Ibb7a6f940816f5839b27af94ca9b3895a84ef2ed
Danica Chang [Wed, 18 Aug 2010 23:47:13 +0000 (16:47 -0700)]
Merge "adding network to prelink"
android-build SharedAccount [Wed, 18 Aug 2010 21:38:05 +0000 (14:38 -0700)]
FRG49
Change-Id: Ibf2fb1a5f077bda95006ffcccf3208ac53a4835d
android-build SharedAccount [Wed, 18 Aug 2010 20:38:19 +0000 (13:38 -0700)]
am
c434bbbb: am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
c434bbbb2c8453f581e0b993ecf23949ca7c5f9b' into gingerbread-plus-aosp
* commit '
c434bbbb2c8453f581e0b993ecf23949ca7c5f9b':
bump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 15:45:04 +0000 (08:45 -0700)]
am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe' into gingerbread
* commit '
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe':
bump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
Ben Dodson [Tue, 17 Aug 2010 21:40:42 +0000 (14:40 -0700)]
Merge "Synchronizing templates with doclava's external ones."
Ben Dodson [Tue, 17 Aug 2010 18:50:38 +0000 (11:50 -0700)]
Merge "Fix for building apicheck tool"
Ben Dodson [Tue, 17 Aug 2010 18:49:18 +0000 (11:49 -0700)]
Fix for building apicheck tool
Change-Id: If0dafa8e45de6a872bf1cc47942335493e96383b
Ben Dodson [Tue, 17 Aug 2010 18:31:33 +0000 (11:31 -0700)]
Merge "Removed unused source files. Apicheck and droiddoc are now in external/doclava."
Ben Dodson [Tue, 17 Aug 2010 16:52:09 +0000 (09:52 -0700)]
Removed unused source files. Apicheck and droiddoc are now in external/doclava.
Change-Id: I13bcdbd27214e15235fa9687b6f15f8853f5f448
Raphael Moll [Tue, 17 Aug 2010 14:51:31 +0000 (07:51 -0700)]
am
ddf08caa: am
ddeb150d: Add easymock for list of Windows SDK targets.
Merge commit '
ddf08caafa9644a502c0804450b9b6572010eb0d'
* commit '
ddf08caafa9644a502c0804450b9b6572010eb0d':
Add easymock for list of Windows SDK targets.
Raphael Moll [Tue, 17 Aug 2010 14:48:46 +0000 (07:48 -0700)]
am
ddeb150d: Add easymock for list of Windows SDK targets.
Merge commit '
ddeb150d8d300806de576430444bf1a84ff35e96' into gingerbread-plus-aosp
* commit '
ddeb150d8d300806de576430444bf1a84ff35e96':
Add easymock for list of Windows SDK targets.
Jean-Baptiste Queru [Mon, 16 Aug 2010 22:18:51 +0000 (15:18 -0700)]
am
4a6e7d7c: am
43d406e5: Merge "add drm/ directory to include it as part of frameworks"
Merge commit '
4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f'
* commit '
4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f':
add drm/ directory to include it as part of frameworks
Raphael Moll [Mon, 16 Aug 2010 18:12:53 +0000 (11:12 -0700)]
Add easymock for list of Windows SDK targets.
Also correctly sorted the windows sdk target list.
Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:15:24 +0000 (08:15 -0700)]
am
43d406e5: Merge "add drm/ directory to include it as part of frameworks"
Merge commit '
43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp
* commit '
43d406e5c633af505de0e05e44fda9cfe781c184':
add drm/ directory to include it as part of frameworks
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:08:48 +0000 (08:08 -0700)]
Merge "add drm/ directory to include it as part of frameworks"
Danica Chang [Fri, 13 Aug 2010 00:30:17 +0000 (17:30 -0700)]
adding network to prelink
Change-Id: I8b18689d17a5b0070392238e5c78954c1f38df5c
android-build SharedAccount [Fri, 13 Aug 2010 18:49:07 +0000 (11:49 -0700)]
FRG22D
Change-Id: Ia5abcd21305a9ee7f646023401e59cb5bb35c700
Hristo Bojinov [Thu, 12 Aug 2010 18:44:49 +0000 (11:44 -0700)]
Merge "Increase the Retouch buffer size."
Ben Murdoch [Thu, 12 Aug 2010 11:45:27 +0000 (12:45 +0100)]
Increase the Retouch buffer size.
New WebKit merge built with JSC javascript engine triggers the
overflow.
Change-Id: I71a9bbc9b27c9a0e7f3680f20be2696f61c3b266
Ben Dodson [Wed, 11 Aug 2010 21:08:28 +0000 (14:08 -0700)]
Fix for heap size in apicheck
Change-Id: Id2efffef3e81464994c3788d1d0bc69c60bc6456
android-build SharedAccount [Wed, 11 Aug 2010 19:23:53 +0000 (12:23 -0700)]
FRG22C
Change-Id: I222497bad7b4eff02a05393678b2e07fc260c55a
Ben Dodson [Wed, 11 Aug 2010 16:27:04 +0000 (09:27 -0700)]
Merge "Use doclava for apicheck"
android-build SharedAccount [Wed, 11 Aug 2010 05:04:39 +0000 (22:04 -0700)]
FRG22B
Change-Id: I0e01dccb378cec768ea51e1454b1c50c8a1a7b75
Ben Dodson [Wed, 11 Aug 2010 01:22:55 +0000 (18:22 -0700)]
Synchronizing templates with doclava's external ones.
Change-Id: Ida95fd6e2f4eb30fbc9200f585aed9dd20996f78
Hung-ying Tyan [Wed, 11 Aug 2010 00:54:32 +0000 (17:54 -0700)]
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
Hung-ying Tyan [Wed, 11 Aug 2010 00:50:28 +0000 (17:50 -0700)]
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
Hung-ying Tyan [Tue, 10 Aug 2010 09:50:25 +0000 (17:50 +0800)]
Make ProGuard keep necessary members for serializable classes
Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193
Ben Dodson [Tue, 10 Aug 2010 23:01:23 +0000 (16:01 -0700)]
Use doclava for apicheck
Change-Id: I6a84717cf645e2a27cea9271c444d159c82439c5
Jean-Baptiste Queru [Mon, 9 Aug 2010 23:42:14 +0000 (16:42 -0700)]
Use all known locales in full build
Also use more audio files
Change-Id: Iab42123239c30012b0d918b5a4b484b5fc878faf
Ben Dodson [Fri, 6 Aug 2010 17:09:46 +0000 (10:09 -0700)]
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 code.google.com/p/doclava"
Chung-yih Wang [Fri, 6 Aug 2010 02:43:45 +0000 (10:43 +0800)]
resolved conflicts for merge of
9b7ebf5d to master
Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
Chung-yih Wang [Fri, 6 Aug 2010 02:37:54 +0000 (19:37 -0700)]
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.
Chung-yih Wang [Fri, 6 Aug 2010 02:35:35 +0000 (19:35 -0700)]
Merge "Add voip(SIP related codes) into framework." into gingerbread
Dima Zavin [Fri, 6 Aug 2010 00:46:47 +0000 (17:46 -0700)]
core: fix paths to libm arch-specific include dirs
Change-Id: I17a1ed13af6d4955a636ad429917b683ac59a947
Signed-off-by: Dima Zavin <dima@android.com>
Ben Dodson [Thu, 5 Aug 2010 22:42:37 +0000 (15:42 -0700)]
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 code.google.com/p/doclava
Change-Id: If317bd108043b152d28babc88a7c949db5127a93
Scott Main [Thu, 5 Aug 2010 22:25:15 +0000 (15:25 -0700)]
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
Scott Main [Thu, 5 Aug 2010 22:25:12 +0000 (15:25 -0700)]
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.
Scott Main [Thu, 5 Aug 2010 22:18:06 +0000 (15:18 -0700)]
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
Scott Main [Thu, 5 Aug 2010 22:18:03 +0000 (15:18 -0700)]
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.
Scott Main [Thu, 5 Aug 2010 22:10:05 +0000 (15:10 -0700)]
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
Scott Main [Thu, 5 Aug 2010 22:10:03 +0000 (15:10 -0700)]
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.
Ying Wang [Thu, 5 Aug 2010 21:14:46 +0000 (14:14 -0700)]
Merge "Now slang supports multiple rs files in a single run."
Ying Wang [Sat, 31 Jul 2010 01:37:29 +0000 (18:37 -0700)]
Now slang supports multiple rs files in a single run.
Change-Id: I26be766614ee3542d76471e3fc55f485ac65bdee
Brian Carlstrom [Thu, 5 Aug 2010 19:13:01 +0000 (12:13 -0700)]
am
f9be4330: am
7dc35a3b: Tracking merge of dalvik-dev to gingerbread
Merge commit '
f9be43305a74fc1c8123cb4eb5c74347acce8a13'
* commit '
f9be43305a74fc1c8123cb4eb5c74347acce8a13':
Tracking merge of dalvik-dev to gingerbread
Thomas Tuttle [Thu, 5 Aug 2010 18:49:14 +0000 (11:49 -0700)]
libublock: Remove from prelink-linux-arm.map (no longer prelinked)
Change-Id: I0415c138e7c05f08bfca7de250fbdbced3e3ab79
Brian Carlstrom [Thu, 5 Aug 2010 17:40:23 +0000 (10:40 -0700)]
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
Scott Main [Thu, 5 Aug 2010 16:44:47 +0000 (09:44 -0700)]
update carousel icon for nexus one dev phone
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
Scott Main [Thu, 5 Aug 2010 15:05:37 +0000 (08:05 -0700)]
Merge "Doc change: Add nexus one to dev phones image." into froyo
Brian Carlstrom [Thu, 5 Aug 2010 06:17:47 +0000 (23:17 -0700)]
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit
f2f3e4b2
git cherry-pick --no-commit
b6a08f0cd36b12054ac73992a2737ea294387116
git cherry-pick --no-commit
d05d74b2d6f717ee25ca14c913ea7610c030ecd1
git cherry-pick --no-commit
5479d77e320420ef0cd7250d1a6729839ef907ce
Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
Chung-yih Wang [Thu, 5 Aug 2010 03:31:07 +0000 (11:31 +0800)]
Add voip(SIP related codes) into framework.
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
Thomas Tuttle [Thu, 5 Aug 2010 00:42:28 +0000 (17:42 -0700)]
libublock: Add to prelink-linux-arm.map
Change-Id: Ie9a4ef8650f22a5146b3a0f0dc049f46199075e9
Colin Cross [Wed, 4 Aug 2010 05:51:49 +0000 (22:51 -0700)]
Disable CheckSize on ext partitions to fix build
Change-Id: I66c67f8bbd84eb9da988b4079ad4c36089c1c930
android-build SharedAccount [Wed, 4 Aug 2010 05:24:15 +0000 (22:24 -0700)]
33b special
Change-Id: I025cf8d2db61752e6816a3ca726445fd869bbc57
Colin Cross [Wed, 4 Aug 2010 01:46:06 +0000 (18:46 -0700)]
Merge "Pass partition size to mkuserimg.sh"
Colin Cross [Wed, 4 Aug 2010 01:45:58 +0000 (18:45 -0700)]
Merge changes I81e84ca0,I6e3a6ba3
* changes:
Pass partition sizes to make_ext4fs
Add dependencies on make_ext4fs
Ying Wang [Wed, 4 Aug 2010 01:05:25 +0000 (18:05 -0700)]
Pass partition size to mkuserimg.sh
Change-Id: Id6a53d8d552e8ce1bdf83fbb756724454e05e5c8
Colin Cross [Tue, 3 Aug 2010 21:43:34 +0000 (14:43 -0700)]
Pass partition sizes to make_ext4fs
Change-Id: I81e84ca02e4326989d25f7d43306c56cdc39348c
Colin Cross [Tue, 3 Aug 2010 21:43:15 +0000 (14:43 -0700)]
Add dependencies on make_ext4fs
Change-Id: I6e3a6ba33fd9e0ce35137f6e2f60d01521af4cb9
Jeff Davidson [Mon, 2 Aug 2010 17:00:44 +0000 (10:00 -0700)]
Add tab completion for lunch.
Change-Id: I4ddfffe8fe4519665a5a66aa60990f900a9ba80a
Jing Yu [Tue, 3 Aug 2010 03:32:42 +0000 (20:32 -0700)]
Merge "Make arm-linux-androideabi toolchain the default for Android build."
Hristo Bojinov [Mon, 2 Aug 2010 17:26:17 +0000 (10:26 -0700)]
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
android-build SharedAccount [Mon, 2 Aug 2010 21:03:32 +0000 (14:03 -0700)]
FRG33
Change-Id: I04cafed766813daf17316651bf5403c3e4823a74
Jing Yu [Thu, 29 Jul 2010 22:07:31 +0000 (15:07 -0700)]
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
Ying Wang [Thu, 29 Jul 2010 17:32:19 +0000 (10:32 -0700)]
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
Ying Wang [Thu, 29 Jul 2010 17:30:13 +0000 (10:30 -0700)]
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
Ying Wang [Thu, 29 Jul 2010 17:27:45 +0000 (10:27 -0700)]
am
55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '
55edb20e246e88afd841f63725c647132d9aca17' into gingerbread
* commit '
55edb20e246e88afd841f63725c647132d9aca17':
Dist apkcerts.txt for unbundled builds
Ying Wang [Thu, 29 Jul 2010 17:21:15 +0000 (10:21 -0700)]
Merge "Dist apkcerts.txt for unbundled builds" into froyo
Xavier Ducrohet [Wed, 28 Jul 2010 22:17:09 +0000 (15:17 -0700)]
am
45270759: am
e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit '
45270759642c03bdbe39ae261e22160d2c64ecec'
* commit '
45270759642c03bdbe39ae261e22160d2c64ecec':
Package ddmlib-prebuilt with CTS.
Xavier Ducrohet [Wed, 28 Jul 2010 22:14:51 +0000 (15:14 -0700)]
am
e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit '
e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp
* commit '
e743c53b88faf35be47667b0252c881c7b32f856':
Package ddmlib-prebuilt with CTS.
Jing Yu [Wed, 28 Jul 2010 21:47:15 +0000 (14:47 -0700)]
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."
The Android Open Source Project [Wed, 28 Jul 2010 18:48:46 +0000 (11:48 -0700)]