android-build SharedAccount
1a1c9368b8
Merge branch 'eclair' into eclair-release
2009-10-06 18:58:23 -07:00
Dianne Hackborn
0187d84264
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
2009-10-06 17:22:49 -07:00
android-build SharedAccount
e212f15cd3
ERD06B
2009-10-06 16:16:42 -07:00
Mike Ritter
ad37305edb
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.
2009-10-06 11:57:51 -07:00
Mike Ritter
c51aa3bd0d
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.
2009-10-06 11:46:36 -07:00
Android (Google) Code Review
69625548bf
Merge change I239e9f26 into donut
...
* changes:
Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit e44fadeb49
)
2009-10-06 14:36:51 -04:00
Android (Google) Code Review
66e0c458ae
Merge change I7bc67c51 into eclair-mr2
...
* changes:
Manual merge of donut-gms cts.mk changes.
2009-10-06 14:09:28 -04:00
Marco Nelissen
fb74a21f47
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.
2009-10-06 11:00:32 -07:00
Joe Onorato
f13231ef8a
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,
2009-10-06 11:00:28 -07:00
Android (Google) Code Review
f885d876a2
Merge change I2bdc7ec9 into eclair
...
* changes:
Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-06 13:48:38 -04:00
Android (Google) Code Review
ea79e65fc6
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.
2009-10-06 13:31:06 -04:00
Scott Main
b268d30a5b
am 5f0241f5
: am 37bfad5c
: docs only. fix FF2 browser bug in header layout
...
Merge commit '5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-mr2
* commit '5f0241f5d8da1db2721c19d7629115a6c1c71639':
docs only.
2009-10-06 10:26:04 -07:00
Scott Main
5f0241f5d8
am 37bfad5c
: docs only. fix FF2 browser bug in header layout
...
Merge commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair
* commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
docs only.
2009-10-06 10:14:01 -07:00
Scott Main
37bfad5ce8
docs only.
...
fix FF2 browser bug in header layout
http://b/2031559
Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
2009-10-06 09:27:10 -07:00
android-build SharedAccount
7355b50733
ERC06
2009-10-06 09:18:56 -07:00
android-build SharedAccount
86ade70fa3
am 16d088ec
: (-s ours) set BUILD_ID, do not merge
...
Merge commit '16d088ec1e02d85f318b4657db91fe0145db67d3'
* commit '16d088ec1e02d85f318b4657db91fe0145db67d3':
set BUILD_ID, do not merge
2009-10-06 02:11:35 -07:00
android-build SharedAccount
2e868c7ed7
ERC05
2009-10-05 15:02:13 -07:00
Joe Onorato
582b21e87e
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
...
and put the commonly used options at the top.
2009-10-05 10:06:54 -07:00
android-build SharedAccount
079121c6e2
ERC02
2009-10-02 17:13:42 -07:00
Jean-Baptiste Queru
03b09fd33f
Remove temporary vold logic
2009-10-02 15:06:40 -07:00
Brett Chabot
7bc67c5114
Manual merge of donut-gms cts.mk changes.
2009-10-02 11:09:41 -07:00
android-build SharedAccount
16d088ec1e
set BUILD_ID, do not merge
2009-10-02 08:01:02 -07:00
android-build SharedAccount
7fcfd04955
ERC01B
2009-10-01 18:27:17 -07:00
Xavier Ducrohet
3f54a5523d
am 814f2a7b
: am d5e2f322
: Merge change I57500a81 into eclair
...
Merge commit '814f2a7bc8db7271c5c1ff410af30458cf105546'
* commit '814f2a7bc8db7271c5c1ff410af30458cf105546':
Add assets from all density to the SDK system image.
2009-10-01 13:47:17 -07:00
Scott Main
07dc76fee2
am 95035daf
: am 39715e2f
: Merge change I962d468d into eclair
...
Merge commit '95035daffba91e776734c927c01d104c4478bd9e'
* commit '95035daffba91e776734c927c01d104c4478bd9e':
revise the deprecated warning to use the 'caution'
2009-10-01 12:22:34 -07:00
Jason Chen
8aa913d35b
am a7aca39c
: am 8d7955dc
: Merge change Ie3f5cd4a into eclair
...
Merge commit 'a7aca39c5b9d8cd626b30fb4f2e6f304163373ca'
* commit 'a7aca39c5b9d8cd626b30fb4f2e6f304163373ca':
Clean steps for a product configuration change.
2009-10-01 12:16:51 -07:00
Xavier Ducrohet
8251c40f2a
am 5feb053c
: am f01a53b6
: am 1933782f
: Remove kickback/talkback/soundback from SDK.
...
Merge commit '5feb053ca7b92e85f5e52e5674b60885edc016e7'
* commit '5feb053ca7b92e85f5e52e5674b60885edc016e7':
Remove kickback/talkback/soundback from SDK.
2009-10-01 12:13:34 -07:00
Dirk Dougherty
dfea61dedb
am 8fd5fb34
: am 96dcc3a9
: am 7259bae0
: Merge change Ied94685e into donut
...
Merge commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9'
* commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9':
Add NDK version reference to template.
2009-10-01 12:13:30 -07:00
Doug Zongker
5eec9dd20f
am da2d06bb
: am c18736b1
: remember device-specific releasetools extensions in target-files
...
Merge commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412'
* commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412':
remember device-specific releasetools extensions in target-files
2009-10-01 12:10:52 -07:00
Andy McFadden
d5c079ee27
am 27c6f996
: am c3c136c4
: Merge change I95ed76bd into eclair
...
Merge commit '27c6f996e9636d6af27a72c4817d082151bc1dea'
* commit '27c6f996e9636d6af27a72c4817d082151bc1dea':
Update usage and readme for zipalign.
2009-10-01 11:17:31 -07:00
android-build SharedAccount
16d7016bed
ERD01
2009-10-01 08:49:59 -07:00
android-build SharedAccount
6f9003b565
Merge commit 'goog/eclair' into eclair-release
2009-10-01 08:43:38 -07:00
Xavier Ducrohet
814f2a7bc8
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.
2009-09-30 21:17:20 -07:00
Android (Google) Code Review
d5e2f32239
Merge change I57500a81 into eclair
...
* changes:
Add assets from all density to the SDK system image.
2009-09-30 22:58:34 -04:00
Xavier Ducrohet
e63137869d
Add assets from all density to the SDK system image.
...
Change-Id: I57500a81607edf04337f0a0a75077c00d6d17274
2009-09-30 17:20:11 -07:00
Scott Main
95035daffb
am 39715e2f
: Merge change I962d468d into eclair
...
Merge commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp
* commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
revise the deprecated warning to use the 'caution'
2009-09-30 15:33:55 -07:00
Android (Google) Code Review
39715e2f3d
Merge change I962d468d into eclair
...
* changes:
revise the deprecated warning to use the 'caution' style and add a line break
2009-09-30 18:23:08 -04:00
android-build SharedAccount
33274507a5
ERC92B
2009-09-30 15:22:35 -07:00
Scott Main
962d468d73
revise the deprecated warning to use the 'caution'
...
style and add a line break
2009-09-30 14:37:32 -07:00
Jason Chen
a7aca39c5b
am 8d7955dc
: Merge change Ie3f5cd4a into eclair
...
Merge commit '8d7955dcefec28bf86121e693355bcea882665c3' into eclair-plus-aosp
* commit '8d7955dcefec28bf86121e693355bcea882665c3':
Clean steps for a product configuration change.
2009-09-30 13:29:18 -07:00
Android (Google) Code Review
8d7955dcef
Merge change Ie3f5cd4a into eclair
...
* changes:
Clean steps for a product configuration change.
2009-09-30 16:20:41 -04:00
Jason Chen
e3f5cd4a25
Clean steps for a product configuration change.
...
Cleans up intermediates produced for a prebuilt app
included in some product configurations.
2009-09-30 12:25:55 -07:00
Mike Ritter
239e9f2671
Bug in Mac build where it gets confused over case, fix no longer needed.
...
(cherry picked from commit e44fadeb49
)
2009-09-30 12:09:19 -07:00
Xavier Ducrohet
5feb053ca7
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.
2009-09-30 11:43:35 -07:00
Dirk Dougherty
8fd5fb34ab
am 96dcc3a9
: am 7259bae0
: Merge change Ied94685e into donut
...
Merge commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4' into eclair-plus-aosp
* commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4':
Add NDK version reference to template.
2009-09-30 11:43:32 -07:00
Xavier Ducrohet
f01a53b67b
am 1933782f
: Remove kickback/talkback/soundback from SDK.
...
Merge commit '1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe' into eclair
* commit '1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe':
Remove kickback/talkback/soundback from SDK.
2009-09-30 11:32:13 -07:00
Dirk Dougherty
96dcc3a98e
am 7259bae0
: Merge change Ied94685e into donut
...
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair
* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
Add NDK version reference to template.
2009-09-30 11:32:09 -07:00
Doug Zongker
da2d06bb1c
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
2009-09-30 10:18:57 -07:00
Doug Zongker
c18736b1a7
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).
2009-09-30 09:20:32 -07:00
The Android Open Source Project
795eae2add
ERC92
2009-09-30 08:37:42 -07:00