Commit graph

3223 commits

Author SHA1 Message Date
android-build SharedAccount
920e102d79 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
2010-08-19 23:42:00 -07:00
Ying Wang
e90cb7dda7 Merge "Fix dependency." 2010-08-18 20:32:28 -07:00
Ying Wang
035ef06522 Fix dependency.
Compile renderscript before building the package-export.apk.

Change-Id: Ibb7a6f940816f5839b27af94ca9b3895a84ef2ed
2010-08-18 20:30:52 -07:00
Danica Chang
9361404081 Merge "adding network to prelink" 2010-08-18 16:47:13 -07:00
android-build SharedAccount
57b1c1cd33 FRG49
Change-Id: Ibf2fb1a5f077bda95006ffcccf3208ac53a4835d
2010-08-18 14:38:05 -07:00
android-build SharedAccount
ba509c8db0 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
2010-08-18 13:38:19 -07:00
android-build SharedAccount
c434bbbb2c 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
2010-08-18 08:45:04 -07:00
android-build SharedAccount
5fad3f5e45 bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
2010-08-17 22:58:21 -07:00
android-build SharedAccount
817a8ac993 bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
2010-08-17 22:44:17 -07:00
Ben Dodson
e7a6af9fe0 Merge "Synchronizing templates with doclava's external ones." 2010-08-17 14:40:42 -07:00
Ben Dodson
fc3a75d0df Merge "Fix for building apicheck tool" 2010-08-17 11:50:38 -07:00
Ben Dodson
834cf50845 Fix for building apicheck tool
Change-Id: If0dafa8e45de6a872bf1cc47942335493e96383b
2010-08-17 11:49:18 -07:00
Ben Dodson
2cce260bba Merge "Removed unused source files. Apicheck and droiddoc are now in external/doclava." 2010-08-17 11:31:33 -07:00
Ben Dodson
5846ec74cc Removed unused source files. Apicheck and droiddoc are now in external/doclava.
Change-Id: I13bcdbd27214e15235fa9687b6f15f8853f5f448
2010-08-17 11:04:56 -07:00
Raphael Moll
839c058dd0 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.
2010-08-17 07:51:31 -07:00
Raphael Moll
ddf08caafa 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.
2010-08-17 07:48:46 -07:00
Jean-Baptiste Queru
f4a956bfb6 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
2010-08-16 15:18:51 -07:00
Raphael Moll
ddeb150d8d Add easymock for list of Windows SDK targets.
Also correctly sorted the windows sdk target list.

Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
2010-08-16 11:17:21 -07:00
Jean-Baptiste Queru
4a6e7d7c49 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
2010-08-16 08:15:24 -07:00
Jean-Baptiste Queru
43d406e5c6 Merge "add drm/ directory to include it as part of frameworks" 2010-08-16 08:08:48 -07:00
Danica Chang
d1d3f299fe adding network to prelink
Change-Id: I8b18689d17a5b0070392238e5c78954c1f38df5c
2010-08-13 15:28:48 -07:00
android-build SharedAccount
059815f328 FRG22D
Change-Id: Ia5abcd21305a9ee7f646023401e59cb5bb35c700
2010-08-13 11:49:07 -07:00
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
android-build SharedAccount
93a2bf55f9 FRG22C
Change-Id: I222497bad7b4eff02a05393678b2e07fc260c55a
2010-08-11 12:23:53 -07:00
Ben Dodson
6629a4a08e Merge "Use doclava for apicheck" 2010-08-11 09:27:05 -07:00
android-build SharedAccount
1c117bd67e FRG22B
Change-Id: I0e01dccb378cec768ea51e1454b1c50c8a1a7b75
2010-08-10 22:04:39 -07:00
Ben Dodson
4dbb28ad29 Synchronizing templates with doclava's external ones.
Change-Id: Ida95fd6e2f4eb30fbc9200f585aed9dd20996f78
2010-08-10 18:34:21 -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