OSDN Git Service
The Android Automerger [Thu, 26 Aug 2010 19:19:47 +0000 (12:19 -0700)]
GRG57B
Change-Id: Ib88b2b8981481bf84d57d4211a6610aeb8382d60
The Android Automerger [Thu, 26 Aug 2010 15:14:37 +0000 (08:14 -0700)]
GRG57
Change-Id: I7d63a557424a0b8251cd065132e92cedd369eb8d
The Android Automerger [Thu, 26 Aug 2010 15:14:17 +0000 (08:14 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Ying Wang [Thu, 26 Aug 2010 03:39:41 +0000 (20:39 -0700)]
Fix mkyaffs2image extra flags in the release tools.
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
Ying Wang [Wed, 25 Aug 2010 23:06:06 +0000 (16:06 -0700)]
Disable building OTA package if there is no kernel.
Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb
Ying Wang [Wed, 25 Aug 2010 22:23:21 +0000 (15:23 -0700)]
Show command lines run by releasetools.
Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309
Ying Wang [Wed, 25 Aug 2010 21:29:34 +0000 (14:29 -0700)]
Fix mkbootimg parameters for releasetools.
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
Bill Napier [Wed, 25 Aug 2010 17:00:59 +0000 (10:00 -0700)]
Merge "DO NOT MERGE: Fix the build by ignoring directories that don't exist." into gingerbread
Bill Napier [Wed, 25 Aug 2010 16:59:14 +0000 (09:59 -0700)]
DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3
Ying Wang [Wed, 25 Aug 2010 16:32:00 +0000 (09:32 -0700)]
Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
The Android Automerger [Wed, 25 Aug 2010 15:28:11 +0000 (08:28 -0700)]
GRG56
Change-Id: Id8501ebc328f461ae8427553cfd0b46dac725c19
The Android Automerger [Wed, 25 Aug 2010 15:27:59 +0000 (08:27 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Rohit Mungee [Wed, 25 Aug 2010 05:58:30 +0000 (22:58 -0700)]
Merge "Add support for multiple html directories to droiddoc." into gingerbread
Bill Napier [Wed, 25 Aug 2010 05:16:01 +0000 (22:16 -0700)]
Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.
Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
Ying Wang [Wed, 25 Aug 2010 01:33:22 +0000 (18:33 -0700)]
Link against Mac OSX 10.5 SDK if building on 10.6.
So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).
Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
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
The Android Automerger [Tue, 24 Aug 2010 15:35:51 +0000 (08:35 -0700)]
GRG55
Change-Id: I06a33c32e7010f996563a4f20cde861603ccdfcc
The Android Automerger [Tue, 24 Aug 2010 15:33:17 +0000 (08:33 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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 19:56:25 +0000 (12:56 -0700)]
Pass pagesize to makebootimage.
Change-Id: I719d765245469921de105430fdd92d478ea48e82
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
The Android Automerger [Mon, 23 Aug 2010 15:27:13 +0000 (08:27 -0700)]
GRG54
Change-Id: Ib4fce55f01604ce9d2b4cb27871e11016cde3c1d
The Android Automerger [Mon, 23 Aug 2010 15:24:13 +0000 (08:24 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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: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 [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 23:41:19 +0000 (16:41 -0700)]
GRG51B
Change-Id: I7d5e2cedb782f7724c6f3f6f2b00c31acd2b8a40
android-build SharedAccount [Fri, 20 Aug 2010 16:21:16 +0000 (09:21 -0700)]
FRG51
Change-Id: Ifa272e3b63d85a5b25a43e3869fea4e62ea0d037
The Android Automerger [Fri, 20 Aug 2010 15:23:19 +0000 (08:23 -0700)]
GRG51
Change-Id: If2f0becf2f57d2de2ec52a5674916d6bf932f04e
The Android Automerger [Thu, 19 Aug 2010 19:42:40 +0000 (12:42 -0700)]
GRG50C
Change-Id: I4dfd55a12acc8c3622cbc6bd342aa8d0419a2620
android-build SharedAccount [Thu, 19 Aug 2010 19:17:21 +0000 (12:17 -0700)]
GRG50B
Change-Id: I450952b5c25386c5471d07fc257aa7b7d8795ad7
The Android Automerger [Thu, 19 Aug 2010 15:25:34 +0000 (08:25 -0700)]
GRG50
Change-Id: Ibf4afc427b9f35527f81922c7eb940aacf7a3461
The Android Automerger [Thu, 19 Aug 2010 15:23:37 +0000 (08:23 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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 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
The Android Automerger [Wed, 18 Aug 2010 15:23:26 +0000 (08:23 -0700)]
GRG49
Change-Id: I7e0c3b4aadf85fada87b9e62aaa3283fdc6f42a1
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
The Android Automerger [Tue, 17 Aug 2010 15:36:44 +0000 (08:36 -0700)]
GRG48
Change-Id: I26adfb243c07a9d4f3b3e1216f447ea951466f3e
The Android Automerger [Mon, 16 Aug 2010 16:21:07 +0000 (09:21 -0700)]
GRG47
Change-Id: I2ddccf4bf46fe8e95cb061c694301522f782941f
The Android Automerger [Fri, 13 Aug 2010 19:09:00 +0000 (12:09 -0700)]
GRG44B
Change-Id: Ic28f85fb8fcabee95dd67f59148ce7716ee7c0d1
android-build SharedAccount [Fri, 13 Aug 2010 18:49:07 +0000 (11:49 -0700)]
FRG22D
Change-Id: Ia5abcd21305a9ee7f646023401e59cb5bb35c700
The Android Automerger [Fri, 13 Aug 2010 15:09:51 +0000 (08:09 -0700)]
GRG44
Change-Id: I56e9a324f2a337dfa8d6edc5117b14948940cb9a
android-build SharedAccount [Fri, 13 Aug 2010 00:12:05 +0000 (17:12 -0700)]
GRG43B
Change-Id: Iecdc3ae9b4c0993e63c597cdcba95570838dc2d3
The Android Automerger [Thu, 12 Aug 2010 17:38:07 +0000 (10:38 -0700)]
GRG43
Change-Id: I7c395c4bdf862290c499ae973c2fb96f89bf99e6
android-build SharedAccount [Wed, 11 Aug 2010 19:23:53 +0000 (12:23 -0700)]
FRG22C
Change-Id: I222497bad7b4eff02a05393678b2e07fc260c55a
The Android Automerger [Wed, 11 Aug 2010 15:29:28 +0000 (08:29 -0700)]
GRG42
Change-Id: I5aa4bfb29a37105ba2b2b85d05de4e2dcfbe83ce
The Android Automerger [Wed, 11 Aug 2010 15:27:53 +0000 (08:27 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Wed, 11 Aug 2010 05:04:39 +0000 (22:04 -0700)]
FRG22B
Change-Id: I0e01dccb378cec768ea51e1454b1c50c8a1a7b75
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
The Android Automerger [Tue, 10 Aug 2010 15:25:29 +0000 (08:25 -0700)]
GRG41
Change-Id: Ie993b9365832d14ddc17112a0a078e67b6a15b2c
Ying Wang [Mon, 9 Aug 2010 21:31:39 +0000 (14:31 -0700)]
Increase dexpreopt emulator respond timeout from 20s to 120s.
Change-Id: I506b1752c86eb8a99ff9f1b8df277d65194ec377
The Android Automerger [Mon, 9 Aug 2010 15:25:59 +0000 (08:25 -0700)]
GRG40
Change-Id: Ib407701bf89abbb1771f228e2019a0f5e5fdaed2
The Android Automerger [Fri, 6 Aug 2010 15:34:34 +0000 (08:34 -0700)]
GRG37
Change-Id: I094bb5a3e34399934f2c12418163c2fb31978927
The Android Automerger [Fri, 6 Aug 2010 15:32:13 +0000 (08:32 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Chung-yih Wang [Fri, 6 Aug 2010 02:35:35 +0000 (19:35 -0700)]
Merge "Add voip(SIP related codes) into framework." into gingerbread
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.
Scott Main [Thu, 5 Aug 2010 16:44:47 +0000 (09:44 -0700)]
update carousel icon for nexus one dev phone
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
The Android Automerger [Thu, 5 Aug 2010 15:14:40 +0000 (08:14 -0700)]
GRG36
Change-Id: I5111058380f62f880fcd7bb12e7878495fcb43f4
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
The Android Automerger [Wed, 4 Aug 2010 15:23:39 +0000 (08:23 -0700)]
GRG35
Change-Id: I8dd6d6ec91f778b742e7f27022b3c49eca8e7abd
android-build SharedAccount [Wed, 4 Aug 2010 05:24:15 +0000 (22:24 -0700)]
33b special
Change-Id: I025cf8d2db61752e6816a3ca726445fd869bbc57
The Android Automerger [Tue, 3 Aug 2010 15:47:21 +0000 (08:47 -0700)]
GRG34
Change-Id: I5c1405aae5555a9d899ffad9b6199bc8b337ab28
android-build SharedAccount [Mon, 2 Aug 2010 21:03:32 +0000 (14:03 -0700)]
FRG33
Change-Id: I04cafed766813daf17316651bf5403c3e4823a74
The Android Automerger [Mon, 2 Aug 2010 15:09:37 +0000 (08:09 -0700)]
GRG33
Change-Id: I1828b5eb1ce87191ee5743e232343d80804e1e15
The Android Automerger [Fri, 30 Jul 2010 15:09:47 +0000 (08:09 -0700)]
GRG30
Change-Id: If5b9f8d67b42668def58f29ef5afe2b9caaf35d3
The Android Automerger [Fri, 30 Jul 2010 15:09:26 +0000 (08:09 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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
The Android Automerger [Thu, 29 Jul 2010 15:20:46 +0000 (08:20 -0700)]
GRG29
Change-Id: Iefa8312b3fc13af4f39769ae34a75d37bbfaa6b7
The Android Automerger [Thu, 29 Jul 2010 15:19:54 +0000 (08:19 -0700)]
Merge branch 'gingerbread' into gingerbread-release
The Android Open Source Project [Wed, 28 Jul 2010 18:35:24 +0000 (11:35 -0700)]
The Android Open Source Project [Wed, 28 Jul 2010 18:24:38 +0000 (11:24 -0700)]
merge from open-source froyo
Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f
The Android Open Source Project [Wed, 28 Jul 2010 17:40:27 +0000 (10:40 -0700)]
reconcile forked froyos
Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
The Android Automerger [Wed, 28 Jul 2010 15:26:56 +0000 (08:26 -0700)]
GRG28
Change-Id: Ife1a68ba1edc1d96250a304c548a86ed498fb4e3
The Android Automerger [Tue, 27 Jul 2010 15:21:02 +0000 (08:21 -0700)]
GRG27
Change-Id: I94196705935d46ec9a6d95f13c3ffd0652e66dde
The Android Automerger [Tue, 27 Jul 2010 15:19:51 +0000 (08:19 -0700)]
Merge branch 'gingerbread' into gingerbread-release
The Android Open Source Project [Mon, 26 Jul 2010 19:06:35 +0000 (12:06 -0700)]
am
af44485f: merge from open-source froyo
Merge commit '
af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread
* commit '
af44485fe83bb36a9d55fb54a8f5362854dd7b10':
Include Test Case List from CTS Project
The Android Open Source Project [Mon, 26 Jul 2010 19:02:01 +0000 (12:02 -0700)]
merge from open-source froyo
Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
The Android Automerger [Mon, 26 Jul 2010 15:25:59 +0000 (08:25 -0700)]
GRG26
Change-Id: I1e76fab59ad57e55992b25361030525e09a52197
The Android Automerger [Mon, 26 Jul 2010 15:22:48 +0000 (08:22 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Ying Wang [Fri, 23 Jul 2010 23:42:13 +0000 (16:42 -0700)]
Dist apkcerts.txt for unbundled builds
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
Dirk Dougherty [Fri, 23 Jul 2010 21:00:22 +0000 (14:00 -0700)]
Doc change: Add nexus one to dev phones image.
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
Evan Charlton [Fri, 23 Jul 2010 19:21:48 +0000 (12:21 -0700)]
resolved conflicts for merge of
121a7873 to gingerbread
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
Evan Charlton [Fri, 23 Jul 2010 18:03:29 +0000 (11:03 -0700)]
Packages can specify where to find AndroidManifest.xml
By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.
Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
The Android Automerger [Fri, 23 Jul 2010 15:25:15 +0000 (08:25 -0700)]
GRG23
Change-Id: I3d75edf4263e3965ca8315ab57a3a1494f00bd44
The Android Automerger [Fri, 23 Jul 2010 15:24:32 +0000 (08:24 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Fri, 23 Jul 2010 05:16:06 +0000 (22:16 -0700)]
FRG22
Change-Id: Ie91f0556bd5e89e8b6640f0a7de1b914558bb564
Ying Wang [Fri, 23 Jul 2010 00:49:13 +0000 (17:49 -0700)]
am
bce4b75f: Add JNI_H_INCLUDE as default header search path
Merge commit '
bce4b75fa7801fcb88c6a9ade9465806fe18d441' into gingerbread
* commit '
bce4b75fa7801fcb88c6a9ade9465806fe18d441':
Add JNI_H_INCLUDE as default header search path
Ying Wang [Thu, 22 Jul 2010 22:51:56 +0000 (15:51 -0700)]
Add JNI_H_INCLUDE as default header search path
So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.
Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
Brian Muramatsu [Thu, 22 Jul 2010 21:46:53 +0000 (14:46 -0700)]
Include Test Case List from CTS Project
Bug
2732160
Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.
Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
Ying Wang [Thu, 22 Jul 2010 17:58:14 +0000 (10:58 -0700)]
am
d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit '
d5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread
* commit '
d5c217aca18726f0ed9f2ea034f750620d4bdf7d':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
Ying Wang [Thu, 22 Jul 2010 17:58:12 +0000 (10:58 -0700)]
am
75b28573: Fix sim build for unbundling native code
Merge commit '
75b28573fe739a10f0f91fab1ef916ddd1c0b91c' into gingerbread
* commit '
75b28573fe739a10f0f91fab1ef916ddd1c0b91c':
Fix sim build for unbundling native code
Ying Wang [Thu, 22 Jul 2010 17:51:03 +0000 (10:51 -0700)]
Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
The Android Automerger [Thu, 22 Jul 2010 15:28:53 +0000 (08:28 -0700)]
GRG22
Change-Id: Ia8fb71ad123f8e86eeeedde7551088f692942afd
The Android Automerger [Wed, 21 Jul 2010 15:29:37 +0000 (08:29 -0700)]
GRG21
Change-Id: I2a4e7f74ea8706233ab97a4b1b9f8831eb3287da
Ying Wang [Tue, 20 Jul 2010 23:18:16 +0000 (16:18 -0700)]
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=
2811503
Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
OSDN Git Service
