OSDN Git Service
Owen Lin [Thu, 22 Oct 2009 16:33:33 +0000 (09:33 -0700)]
am
355670b9: am
64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '
355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp
* commit '
355670b98584210502f96fe0446a854f07026c28':
Add OVERRIDE_PACKAGES support for prebuild modules.
Brandon Ballinger [Thu, 22 Oct 2009 16:33:29 +0000 (09:33 -0700)]
am
c6c46243: am
36f349ac: Merge change Ied29246e into eclair
Merge commit '
c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp
* commit '
c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Owen Lin [Thu, 22 Oct 2009 13:44:28 +0000 (06:44 -0700)]
am
64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '
64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2
* commit '
64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
Brandon Ballinger [Thu, 22 Oct 2009 13:43:04 +0000 (06:43 -0700)]
am
36f349ac: Merge change Ied29246e into eclair
Merge commit '
36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2
* commit '
36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Doug Zongker [Thu, 22 Oct 2009 05:31:04 +0000 (22:31 -0700)]
am
b04f8cdc: am
decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
Merge commit '
b04f8cdccf01132c7c14df1fed1f39c9dbb752c6' into eclair-mr2-plus-aosp
* commit '
b04f8cdccf01132c7c14df1fed1f39c9dbb752c6':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Doug Zongker [Thu, 22 Oct 2009 05:22:32 +0000 (22:22 -0700)]
am
decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
Merge commit '
decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2
* commit '
decdbd7956c34895f73001cfa2018a27c8702ad0':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Owen Lin [Fri, 16 Oct 2009 09:43:05 +0000 (02:43 -0700)]
Add OVERRIDE_PACKAGES support for prebuild modules.
So that some prebuild module can override existing packages.
Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27
Android (Google) Code Review [Wed, 21 Oct 2009 02:28:45 +0000 (22:28 -0400)]
Merge change Ied29246e into eclair
* changes:
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Brandon Ballinger [Wed, 21 Oct 2009 00:41:16 +0000 (17:41 -0700)]
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Android (Google) Code Review [Tue, 20 Oct 2009 20:28:14 +0000 (16:28 -0400)]
Merge change I5e98e6f0 into eclair
* changes:
use aapt to build jar files instead of the system zip (DO NOT MERGE)
Owen Lin [Tue, 20 Oct 2009 17:08:00 +0000 (10:08 -0700)]
am
daf234d3: am
0a7b54de: Add package Gallery into default build.
Merge commit '
daf234d374840d96282b34393309487a21ab45c4' into eclair-mr2-plus-aosp
* commit '
daf234d374840d96282b34393309487a21ab45c4':
Add package Gallery into default build.
Owen Lin [Tue, 20 Oct 2009 16:57:53 +0000 (09:57 -0700)]
am
0a7b54de: Add package Gallery into default build.
Merge commit '
0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21' into eclair-mr2
* commit '
0a7b54de3a7b3a13d8bcc1a11286f374ae51dc21':
Add package Gallery into default build.
Owen Lin [Thu, 15 Oct 2009 09:09:18 +0000 (02:09 -0700)]
Add package Gallery into default build.
Change-Id: Ia4447fdb6c4c26a5419ef59cc9d8276838a95854
Steve Block [Tue, 20 Oct 2009 09:34:59 +0000 (02:34 -0700)]
am
9234663c: WebKit clean required by merge with new WebKit version.
Merge commit '
9234663c558239cc7f97f5daf287f12a177e7dba' into eclair-mr2-plus-aosp
* commit '
9234663c558239cc7f97f5daf287f12a177e7dba':
WebKit clean required by merge with new WebKit version.
Doug Zongker [Tue, 20 Oct 2009 00:05:46 +0000 (17:05 -0700)]
use aapt to build jar files instead of the system zip (DO NOT MERGE)
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Steve Block [Mon, 19 Oct 2009 17:41:07 +0000 (18:41 +0100)]
WebKit clean required by merge with new WebKit version.
Change-Id: I59377d6a0420bfb13b25b4ed7240b47e8aae6114
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:08 +0000 (16:02 -0700)]
merge from open-source master
Jean-Baptiste Queru [Wed, 14 Oct 2009 15:18:24 +0000 (08:18 -0700)]
merge from open-source master
Android (Google) Code Review [Tue, 13 Oct 2009 21:12:59 +0000 (17:12 -0400)]
Merge change I04432db5 into eclair-mr2
* changes:
use aapt to build jar files instead of the system zip
Raphael [Tue, 13 Oct 2009 19:18:21 +0000 (12:18 -0700)]
am
aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit '
aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-plus-aosp
* commit '
aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Raphael [Tue, 13 Oct 2009 19:17:40 +0000 (12:17 -0700)]
am
aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit '
aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2
* commit '
aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Raphael [Mon, 12 Oct 2009 23:16:02 +0000 (16:16 -0700)]
Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
Doug Zongker [Fri, 9 Oct 2009 19:11:30 +0000 (12:11 -0700)]
use aapt to build jar files instead of the system zip
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
Dianne Hackborn [Fri, 9 Oct 2009 04:07:12 +0000 (21:07 -0700)]
am
ff6f3fe4: Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Merge commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2
* commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Dianne Hackborn [Fri, 9 Oct 2009 04:06:51 +0000 (21:06 -0700)]
am
ff6f3fe4: Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Merge commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-plus-aosp
* commit '
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
Dianne Hackborn [Fri, 9 Oct 2009 03:50:27 +0000 (20:50 -0700)]
Finish issue #
2168428: STOP SHIP: Bump API version to 5.
We are now 2.0. Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.
Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
Brett Chabot [Thu, 8 Oct 2009 21:42:58 +0000 (14:42 -0700)]
Merge commit '
1b3886b8' into manualmerge
Brett Chabot [Thu, 8 Oct 2009 20:47:07 +0000 (13:47 -0700)]
Merge commit '
af6ccb69' into manualmerge
Brett Chabot [Thu, 8 Oct 2009 18:19:00 +0000 (11:19 -0700)]
am
1b3886b8: am
45dc54f6: Add speech tests to CTS makefile.
Merge commit '
1b3886b8485589438a86ccb5b9dbb9067da35627' into eclair-plus-aosp
* commit '
1b3886b8485589438a86ccb5b9dbb9067da35627':
Add speech tests to CTS makefile.
Brett Chabot [Thu, 8 Oct 2009 18:18:57 +0000 (11:18 -0700)]
am
af6ccb69: am
30e1f2bd: Add dpi tests to CTS.
Merge commit '
af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4' into eclair-plus-aosp
* commit '
af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4':
Add dpi tests to CTS.
Brett Chabot [Thu, 8 Oct 2009 17:48:24 +0000 (10:48 -0700)]
am
45dc54f6: Add speech tests to CTS makefile.
Merge commit '
45dc54f680faea12519870db356f84924c00687d' into eclair
* commit '
45dc54f680faea12519870db356f84924c00687d':
Add speech tests to CTS makefile.
Brett Chabot [Thu, 8 Oct 2009 17:48:20 +0000 (10:48 -0700)]
am
30e1f2bd: Add dpi tests to CTS.
Merge commit '
30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair
* commit '
30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
Add dpi tests to CTS.
Brett Chabot [Thu, 17 Sep 2009 01:56:23 +0000 (18:56 -0700)]
Add speech tests to CTS makefile.
Brett Chabot [Thu, 10 Sep 2009 20:35:54 +0000 (13:35 -0700)]
Add dpi tests to CTS.
Android (Google) Code Review [Thu, 8 Oct 2009 01:09:17 +0000 (21:09 -0400)]
Merge change I5bbd2294 into eclair-mr2
* changes:
For Ying Wang:
Doug Zongker [Thu, 8 Oct 2009 00:19:28 +0000 (17:19 -0700)]
am
f2b32f2a: resolved conflicts for merge of
cfd7db6d to eclair
Merge commit '
f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2
* commit '
f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
move recovery image to the top of the OTA package
Doug Zongker [Thu, 8 Oct 2009 00:17:45 +0000 (17:17 -0700)]
am
f2b32f2a: resolved conflicts for merge of
cfd7db6d to eclair
Merge commit '
f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-plus-aosp
* commit '
f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
move recovery image to the top of the OTA package
Doug Zongker [Thu, 8 Oct 2009 00:05:36 +0000 (17:05 -0700)]
resolved conflicts for merge of
cfd7db6d to eclair
Sriram Raman [Wed, 7 Oct 2009 23:27:38 +0000 (16:27 -0700)]
For Ying Wang:
Fix "argument list too long" build error bug.
Doug Zongker [Wed, 7 Oct 2009 18:35:53 +0000 (11:35 -0700)]
move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
Jeff Hamilton [Wed, 7 Oct 2009 19:02:43 +0000 (12:02 -0700)]
am
979d5567: Merge change I6b350185 into eclair
Merge commit '
979d5567b72b4f3a8219b4786f9f512601645121' into eclair-plus-aosp
* commit '
979d5567b72b4f3a8219b4786f9f512601645121':
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Wed, 7 Oct 2009 19:02:18 +0000 (12:02 -0700)]
am
0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '
0889661cd890e49a4827da0dc5d583274347d178' into eclair-plus-aosp
* commit '
0889661cd890e49a4827da0dc5d583274347d178':
eng builds only -- make the thing that makes setupwizard optional actually work.
Dianne Hackborn [Wed, 7 Oct 2009 18:59:56 +0000 (11:59 -0700)]
am
0187d842: Part of issue #
2168428: STOP SHIP: Bump API version to 5
Merge commit '
0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-plus-aosp
* commit '
0187d84264fb6cf67650354c8c5da0a0712dbb0b':
Part of issue #
2168428: STOP SHIP: Bump API version to 5
Mike Ritter [Wed, 7 Oct 2009 18:54:56 +0000 (11:54 -0700)]
am
c51aa3bd: am
69625548: Merge change I239e9f26 into donut
Merge commit '
c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-plus-aosp
* commit '
c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
Bug in Mac build where it gets confused over case, fix no longer needed.
Marco Nelissen [Wed, 7 Oct 2009 18:54:04 +0000 (11:54 -0700)]
am
f885d876: Merge change I2bdc7ec9 into eclair
Merge commit '
f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-plus-aosp
* commit '
f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
Speed up warn.py about 30x by precompiling all the regular expressions.
Joe Onorato [Wed, 7 Oct 2009 18:54:00 +0000 (11:54 -0700)]
am
ea79e65f: Merge change Ib7704386 into eclair
Merge commit '
ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-plus-aosp
* commit '
ea79e65fc656351ffeae1daa2cc40abba05d56b9':
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
Scott Main [Wed, 7 Oct 2009 18:53:41 +0000 (11:53 -0700)]
am
5f0241f5: am
37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '
5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-plus-aosp
* commit '
5f0241f5d8da1db2721c19d7629115a6c1c71639':
docs only.
Jeff Hamilton [Wed, 7 Oct 2009 18:38:17 +0000 (11:38 -0700)]
am
979d5567: Merge change I6b350185 into eclair
Merge commit '
979d5567b72b4f3a8219b4786f9f512601645121' into eclair-mr2
* commit '
979d5567b72b4f3a8219b4786f9f512601645121':
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Wed, 7 Oct 2009 18:37:52 +0000 (11:37 -0700)]
am
0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '
0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2
* commit '
0889661cd890e49a4827da0dc5d583274347d178':
eng builds only -- make the thing that makes setupwizard optional actually work.
Android (Google) Code Review [Wed, 7 Oct 2009 18:05:28 +0000 (14:05 -0400)]
Merge change I6b350185 into eclair
* changes:
Add a cleanspec rule for the change to bump the API version to 5.
Joe Onorato [Wed, 7 Oct 2009 17:01:13 +0000 (10:01 -0700)]
eng builds only -- make the thing that makes setupwizard optional actually work.
Jeff Hamilton [Wed, 7 Oct 2009 05:30:19 +0000 (00:30 -0500)]
Add a cleanspec rule for the change to bump the API version to 5.
Change-Id: I6b35018552b3a9fc2016f054c8a3c2feb41bc0ad
Dianne Hackborn [Wed, 7 Oct 2009 02:22:41 +0000 (19:22 -0700)]
am
0187d842: Part of issue #
2168428: STOP SHIP: Bump API version to 5
Merge commit '
0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2
* commit '
0187d84264fb6cf67650354c8c5da0a0712dbb0b':
Part of issue #
2168428: STOP SHIP: Bump API version to 5
Dianne Hackborn [Wed, 7 Oct 2009 00:22:49 +0000 (17:22 -0700)]
Part of issue #
2168428: STOP SHIP: Bump API version to 5
This bumps the API version. We are still going to be an Eclair
development version until prebuilts are updated.
Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
Mike Ritter [Tue, 6 Oct 2009 18:57:51 +0000 (11:57 -0700)]
am
c51aa3bd: am
69625548: Merge change I239e9f26 into donut
Merge commit '
c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-mr2
* commit '
c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
Bug in Mac build where it gets confused over case, fix no longer needed.
Mike Ritter [Tue, 6 Oct 2009 18:46:36 +0000 (11:46 -0700)]
am
69625548: Merge change I239e9f26 into donut
Merge commit '
69625548bf020685cdcb57dffe8f34aba80f11e5' into eclair
* commit '
69625548bf020685cdcb57dffe8f34aba80f11e5':
Bug in Mac build where it gets confused over case, fix no longer needed.
Android (Google) Code Review [Tue, 6 Oct 2009 18:36:51 +0000 (14:36 -0400)]
Merge change I239e9f26 into donut
* changes:
Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit
e44fadeb49aac9d762f089ee2f23e4a4907a822f)
Android (Google) Code Review [Tue, 6 Oct 2009 18:09:28 +0000 (14:09 -0400)]
Merge change I7bc67c51 into eclair-mr2
* changes:
Manual merge of donut-gms cts.mk changes.
Marco Nelissen [Tue, 6 Oct 2009 18:00:32 +0000 (11:00 -0700)]
am
f885d876: Merge change I2bdc7ec9 into eclair
Merge commit '
f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-mr2
* commit '
f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
Speed up warn.py about 30x by precompiling all the regular expressions.
Joe Onorato [Tue, 6 Oct 2009 18:00:28 +0000 (11:00 -0700)]
am
ea79e65f: Merge change Ib7704386 into eclair
Merge commit '
ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-mr2
* commit '
ea79e65fc656351ffeae1daa2cc40abba05d56b9':
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
Android (Google) Code Review [Tue, 6 Oct 2009 17:48:38 +0000 (13:48 -0400)]
Merge change I2bdc7ec9 into eclair
* changes:
Speed up warn.py about 30x by precompiling all the regular expressions.
Android (Google) Code Review [Tue, 6 Oct 2009 17:31:06 +0000 (13:31 -0400)]
Merge change Ib7704386 into eclair
* changes:
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default, and put the commonly used options at the top.
Scott Main [Tue, 6 Oct 2009 17:26:04 +0000 (10:26 -0700)]
am
5f0241f5: am
37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '
5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-mr2
* commit '
5f0241f5d8da1db2721c19d7629115a6c1c71639':
docs only.
Scott Main [Tue, 6 Oct 2009 17:14:01 +0000 (10:14 -0700)]
am
37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '
37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair
* commit '
37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
docs only.
Scott Main [Tue, 6 Oct 2009 16:05:48 +0000 (09:05 -0700)]
docs only.
fix FF2 browser bug in header layout
http://b/
2031559
Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
Joe Onorato [Mon, 5 Oct 2009 17:06:25 +0000 (10:06 -0700)]
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
and put the commonly used options at the top.
Jean-Baptiste Queru [Fri, 2 Oct 2009 22:06:40 +0000 (15:06 -0700)]
Remove temporary vold logic
Brett Chabot [Fri, 2 Oct 2009 18:09:41 +0000 (11:09 -0700)]
Manual merge of donut-gms cts.mk changes.
android-build SharedAccount [Fri, 2 Oct 2009 15:01:02 +0000 (08:01 -0700)]
set BUILD_ID, do not merge
Xavier Ducrohet [Thu, 1 Oct 2009 04:17:20 +0000 (21:17 -0700)]
am
d5e2f322: Merge change I57500a81 into eclair
Merge commit '
d5e2f32239edf1abde61d6abb9d4f74bbe824464' into eclair-plus-aosp
* commit '
d5e2f32239edf1abde61d6abb9d4f74bbe824464':
Add assets from all density to the SDK system image.
Android (Google) Code Review [Thu, 1 Oct 2009 02:58:34 +0000 (22:58 -0400)]
Merge change I57500a81 into eclair
* changes:
Add assets from all density to the SDK system image.
Xavier Ducrohet [Thu, 1 Oct 2009 00:20:11 +0000 (17:20 -0700)]
Add assets from all density to the SDK system image.
Change-Id: I57500a81607edf04337f0a0a75077c00d6d17274
Scott Main [Wed, 30 Sep 2009 22:33:55 +0000 (15:33 -0700)]
am
39715e2f: Merge change I962d468d into eclair
Merge commit '
39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp
* commit '
39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
revise the deprecated warning to use the 'caution'
Android (Google) Code Review [Wed, 30 Sep 2009 22:23:08 +0000 (18:23 -0400)]
Merge change I962d468d into eclair
* changes:
revise the deprecated warning to use the 'caution' style and add a line break
Scott Main [Wed, 30 Sep 2009 21:37:32 +0000 (14:37 -0700)]
revise the deprecated warning to use the 'caution'
style and add a line break
Jason Chen [Wed, 30 Sep 2009 20:29:18 +0000 (13:29 -0700)]
am
8d7955dc: Merge change Ie3f5cd4a into eclair
Merge commit '
8d7955dcefec28bf86121e693355bcea882665c3' into eclair-plus-aosp
* commit '
8d7955dcefec28bf86121e693355bcea882665c3':
Clean steps for a product configuration change.
Android (Google) Code Review [Wed, 30 Sep 2009 20:20:41 +0000 (16:20 -0400)]
Merge change Ie3f5cd4a into eclair
* changes:
Clean steps for a product configuration change.
Jason Chen [Wed, 30 Sep 2009 19:25:55 +0000 (12:25 -0700)]
Clean steps for a product configuration change.
Cleans up intermediates produced for a prebuilt app
included in some product configurations.
Mike Ritter [Wed, 30 Sep 2009 19:09:19 +0000 (12:09 -0700)]
Bug in Mac build where it gets confused over case, fix no longer needed.
(cherry picked from commit
e44fadeb49aac9d762f089ee2f23e4a4907a822f)
Xavier Ducrohet [Wed, 30 Sep 2009 18:43:35 +0000 (11:43 -0700)]
am
f01a53b6: am
1933782f: Remove kickback/talkback/soundback from SDK.
Merge commit '
f01a53b67b72de3e4f27bd3103d7223636683e74' into eclair-plus-aosp
* commit '
f01a53b67b72de3e4f27bd3103d7223636683e74':
Remove kickback/talkback/soundback from SDK.
Dirk Dougherty [Wed, 30 Sep 2009 18:43:32 +0000 (11:43 -0700)]
am
96dcc3a9: am
7259bae0: Merge change Ied94685e into donut
Merge commit '
96dcc3a98edfc8e4ed9d6ef851112927b05d71f4' into eclair-plus-aosp
* commit '
96dcc3a98edfc8e4ed9d6ef851112927b05d71f4':
Add NDK version reference to template.
Xavier Ducrohet [Wed, 30 Sep 2009 18:32:13 +0000 (11:32 -0700)]
am
1933782f: Remove kickback/talkback/soundback from SDK.
Merge commit '
1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe' into eclair
* commit '
1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe':
Remove kickback/talkback/soundback from SDK.
Dirk Dougherty [Wed, 30 Sep 2009 18:32:09 +0000 (11:32 -0700)]
am
7259bae0: Merge change Ied94685e into donut
Merge commit '
7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair
* commit '
7259bae08d7915c0d5ba6427c815d7576c0ef045':
Add NDK version reference to template.
Doug Zongker [Wed, 30 Sep 2009 17:18:57 +0000 (10:18 -0700)]
am
c18736b1: remember device-specific releasetools extensions in target-files
Merge commit '
c18736b1a777c386dc3c5e3f878249770b5edd78' into eclair-plus-aosp
* commit '
c18736b1a777c386dc3c5e3f878249770b5edd78':
remember device-specific releasetools extensions in target-files
Doug Zongker [Wed, 30 Sep 2009 16:20:32 +0000 (09:20 -0700)]
remember device-specific releasetools extensions in target-files
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
Xavier Ducrohet [Wed, 30 Sep 2009 01:11:05 +0000 (18:11 -0700)]
Remove kickback/talkback/soundback from SDK.
These apps are not in the AOSP tree and cannot be part of the standard SDK
build.
They are available at http://code.google.com/p/eyes-free/
Andy McFadden [Tue, 29 Sep 2009 18:41:46 +0000 (11:41 -0700)]
am
c3c136c4: Merge change I95ed76bd into eclair
Merge commit '
c3c136c4cd5ad5f21e29511b622436518a3c1c9f' into eclair-plus-aosp
* commit '
c3c136c4cd5ad5f21e29511b622436518a3c1c9f':
Update usage and readme for zipalign.
Android (Google) Code Review [Tue, 29 Sep 2009 18:31:43 +0000 (14:31 -0400)]
Merge change I95ed76bd into eclair
* changes:
Update usage and readme for zipalign.
Andy McFadden [Tue, 29 Sep 2009 17:55:32 +0000 (10:55 -0700)]
Update usage and readme for zipalign.
Added the "-c" flag to the README, and added a short description of the
flag meanings to the usage output. Threw in an AOSP copyright one-liner
for good measure.
Marco Nelissen [Tue, 29 Sep 2009 17:19:29 +0000 (10:19 -0700)]
Speed up warn.py about 30x by precompiling all the regular expressions.
Android (Google) Code Review [Tue, 29 Sep 2009 15:43:24 +0000 (11:43 -0400)]
Merge change Ied94685e into donut
* changes:
Add NDK version reference to template.
Dave Sparks [Tue, 29 Sep 2009 00:43:48 +0000 (17:43 -0700)]
am
55ad5cc3: Change default notification to OnTheHunt. Bug
2146688.
Merge commit '
55ad5cc3e64afe9450ceaee0a25a2e8c0e97efea' into eclair-plus-aosp
* commit '
55ad5cc3e64afe9450ceaee0a25a2e8c0e97efea':
Change default notification to OnTheHunt. Bug
2146688.
Dave Sparks [Mon, 28 Sep 2009 21:54:58 +0000 (14:54 -0700)]
Change default notification to OnTheHunt. Bug
2146688.
Nick Pelly [Mon, 28 Sep 2009 20:55:23 +0000 (13:55 -0700)]
am
dfb05e7a: cleanspek for Bluetooth API change.
Merge commit '
dfb05e7a16a98844e4f47d707193fe05f1d3fc13' into eclair-plus-aosp
* commit '
dfb05e7a16a98844e4f47d707193fe05f1d3fc13':
cleanspek for Bluetooth API change.
Nick Pelly [Mon, 28 Sep 2009 20:34:07 +0000 (13:34 -0700)]
cleanspek for Bluetooth API change.
Change-Id: I3bc628b4dae7757aa616f09a69e6c0f6612b7f87
Doug Zongker [Mon, 28 Sep 2009 17:20:34 +0000 (10:20 -0700)]
am
481c4e65: fix python syntax error
Merge commit '
481c4e650fe6cdb9c63ad04b35d221a2856ca48d' into eclair-plus-aosp
* commit '
481c4e650fe6cdb9c63ad04b35d221a2856ca48d':
fix python syntax error
Doug Zongker [Mon, 28 Sep 2009 17:07:13 +0000 (10:07 -0700)]
fix python syntax error
Jeff Hamilton [Sat, 26 Sep 2009 03:51:36 +0000 (20:51 -0700)]
am
d85472a7: Fix the build. imgdiff.c needed #include <sys/types.h>.
Merge commit '
d85472a7461d0daeb7e17a6f0a7c56f37a2335bc' into eclair-plus-aosp
* commit '
d85472a7461d0daeb7e17a6f0a7c56f37a2335bc':
Fix the build. imgdiff.c needed #include <sys/types.h>.
Jeff Hamilton [Sat, 26 Sep 2009 02:47:52 +0000 (21:47 -0500)]
Fix the build. imgdiff.c needed #include <sys/types.h>.
Change-Id: I82169a926e7df2aa92bac2c4f427bc64f4811362
Doug Zongker [Sat, 26 Sep 2009 00:13:36 +0000 (17:13 -0700)]
am
7f116185: add missing include directory
Merge commit '
7f116185cc254653f9f7abd572d2619d5ddc6f04' into eclair-plus-aosp
* commit '
7f116185cc254653f9f7abd572d2619d5ddc6f04':
add missing include directory
OSDN Git Service
