bfa7a8fbda
Merge commit 'goog/eclair-plus-aosp'
2009-12-15 00:44:45 -08:00
a660e48ea7
am 4cac8afc: am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt
...
Merge commit '4cac8afc21a356ce3ca074f12383cf1526d44156'
* commit '4cac8afc21a356ce3ca074f12383cf1526d44156':
include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 15:33:14 -08:00
4cac8afc21
am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt
...
Merge commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp
* commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 15:24:22 -08:00
714111cbdd
include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 10:14:46 -08:00
3a104c868e
am 39ecb46e: am 9bc88726: Merge change I45302ff0 into eclair-mr2
...
Merge commit '39ecb46ed1c124e4d3e3ebb594a62b65984483ac'
* commit '39ecb46ed1c124e4d3e3ebb594a62b65984483ac':
make prebuilt .apks require LOCAL_CERTIFICATE
2009-12-11 15:01:40 -08:00
39ecb46ed1
am 9bc88726: Merge change I45302ff0 into eclair-mr2
...
Merge commit '9bc88726cb24e92007d42c126ec094e687b3905f' into eclair-mr2-plus-aosp
* commit '9bc88726cb24e92007d42c126ec094e687b3905f':
make prebuilt .apks require LOCAL_CERTIFICATE
2009-12-11 14:54:54 -08:00
9bc88726cb
Merge change I45302ff0 into eclair-mr2
...
* changes:
make prebuilt .apks require LOCAL_CERTIFICATE
2009-12-11 14:50:33 -08:00
45302ff00b
make prebuilt .apks require LOCAL_CERTIFICATE
...
Require people who check in new prebuilts to decide what keys they
should be signed with, rather than having a fire drill every time we
go to sign a build and discover new prebuilts.
2009-12-11 13:50:35 -08:00
1e99d1688e
am be4eca18: am f7b3211e: am 1dd6ff63: Merge change I483cf38d into eclair
...
Merge commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38'
* commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38':
docs: add "figure" class for DIV elements that contain
2009-12-10 23:41:29 -08:00
27861a988c
am baefd248: am 92e2d3e2: am 6ef046c8: Fixes ProGuard options.
...
Merge commit 'baefd2480f63ad9b3a5ec9764879ae01f2ad9886'
* commit 'baefd2480f63ad9b3a5ec9764879ae01f2ad9886':
Fixes ProGuard options.
2009-12-10 23:41:26 -08:00
be4eca1894
am f7b3211e: am 1dd6ff63: Merge change I483cf38d into eclair
...
Merge commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb' into eclair-mr2-plus-aosp
* commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb':
docs: add "figure" class for DIV elements that contain
2009-12-10 17:52:19 -08:00
baefd2480f
am 92e2d3e2: am 6ef046c8: Fixes ProGuard options.
...
Merge commit '92e2d3e206a301a090d90e8c61d85e88fdc35a71' into eclair-mr2-plus-aosp
* commit '92e2d3e206a301a090d90e8c61d85e88fdc35a71':
Fixes ProGuard options.
2009-12-10 17:52:12 -08:00
f7b3211e08
am 1dd6ff63: Merge change I483cf38d into eclair
...
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-mr2
* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
docs: add "figure" class for DIV elements that contain
2009-12-10 17:44:38 -08:00
92e2d3e206
am 6ef046c8: Fixes ProGuard options.
...
Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-mr2
* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
Fixes ProGuard options.
2009-12-10 17:39:53 -08:00
8517366a7a
am c9806cfd: am bbfb96f4: remove shared_uid cert check from sign_targt_file_apks
...
Merge commit 'c9806cfd31ee660d0fa01c88c42a374c9a9ae8bd'
* commit 'c9806cfd31ee660d0fa01c88c42a374c9a9ae8bd':
remove shared_uid cert check from sign_targt_file_apks
2009-12-10 14:41:49 -08:00
f928dd7af0
am a492ecce: am fe8ff19a: Merge change Ief993a27 into eclair-mr2
...
Merge commit 'a492ecce759417b965f93edcc40919866240d581'
* commit 'a492ecce759417b965f93edcc40919866240d581':
add signing checker script to releasetools
2009-12-10 14:41:20 -08:00
0235b4d595
am 23c1f0ca: am 5ae770fc: add option to @hide classes generated from .logtags files
...
Merge commit '23c1f0ca7d629af4de06fb2b05ee9add2bf0a4d5'
* commit '23c1f0ca7d629af4de06fb2b05ee9add2bf0a4d5':
add option to @hide classes generated from .logtags files
2009-12-10 14:38:10 -08:00
c9806cfd31
am bbfb96f4: remove shared_uid cert check from sign_targt_file_apks
...
Merge commit 'bbfb96f46472c74e2dbdd190fb67cdda13347eb4' into eclair-mr2-plus-aosp
* commit 'bbfb96f46472c74e2dbdd190fb67cdda13347eb4':
remove shared_uid cert check from sign_targt_file_apks
2009-12-10 11:44:09 -08:00
bbfb96f464
remove shared_uid cert check from sign_targt_file_apks
...
This check (and others) are now done by the separate script
check_target_files_signatures; the one here is redundant.
2009-12-10 11:22:57 -08:00
a492ecce75
am fe8ff19a: Merge change Ief993a27 into eclair-mr2
...
Merge commit 'fe8ff19a2a0698d43868c86b5cead0553bdef8ea' into eclair-mr2-plus-aosp
* commit 'fe8ff19a2a0698d43868c86b5cead0553bdef8ea':
add signing checker script to releasetools
2009-12-10 09:42:10 -08:00
fe8ff19a2a
Merge change Ief993a27 into eclair-mr2
...
* changes:
add signing checker script to releasetools
2009-12-10 09:37:19 -08:00
d20ccb2361
manual merge
2009-12-10 09:31:38 -08:00
8625adde23
am 1dd6ff63: Merge change I483cf38d into eclair
...
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-plus-aosp
* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
docs: add "figure" class for DIV elements that contain
2009-12-09 18:17:50 -08:00
1dd6ff638f
Merge change I483cf38d into eclair
...
* changes:
docs: add "figure" class for DIV elements that contain a figure image with caption text.
2009-12-09 18:13:09 -08:00
483cf38d8d
docs: add "figure" class for DIV elements that contain
...
a figure image with caption text.
needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
2009-12-09 18:08:32 -08:00
23c1f0ca7d
am 5ae770fc: add option to @hide classes generated from .logtags files
...
Merge commit '5ae770fc0e43172e1efc5146a38e7d1f452143e2' into eclair-mr2-plus-aosp
* commit '5ae770fc0e43172e1efc5146a38e7d1f452143e2':
add option to @hide classes generated from .logtags files
2009-12-09 16:01:33 -08:00
7130f1c7ab
am 3a59b2ce: Remove Google-specific files
...
Merge commit '3a59b2ceb9fee68eef0428e5458edfbb9e09936c' into eclair-mr2-plus-aosp
* commit '3a59b2ceb9fee68eef0428e5458edfbb9e09936c':
Remove Google-specific files
2009-12-09 15:54:11 -08:00
d48054d52c
am 6254132a: remove old p4->git import history
...
Merge commit '6254132a3e1a850231f51cbead46891ced7aa083' into eclair-mr2-plus-aosp
* commit '6254132a3e1a850231f51cbead46891ced7aa083':
remove old p4->git import history
2009-12-09 15:54:07 -08:00
92269fdd4f
am 6ef046c8: Fixes ProGuard options.
...
Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-plus-aosp
* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
Fixes ProGuard options.
2009-12-09 14:59:19 -08:00
6ef046c893
Fixes ProGuard options.
...
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
2009-12-09 14:31:22 -08:00
5ae770fc0e
add option to @hide classes generated from .logtags files
...
Generate a javadoc @hide comment on the class when "option
javadoc_hide true" is specified in the input .logtags file.
2009-12-09 12:31:00 -08:00
75f1736469
add signing checker script to releasetools
...
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files. It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
2009-12-09 09:36:41 -08:00
3a59b2ceb9
Remove Google-specific files
...
Also remove unused configuration
2009-12-08 15:11:04 -08:00
e79b9dfc06
am 0be5c863: am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
...
Merge commit '0be5c863a204cc37fda35574c3111ac363b26b17'
* commit '0be5c863a204cc37fda35574c3111ac363b26b17':
docs: add context coloring to code snippets with prettify script
2009-12-08 14:51:26 -08:00
6254132a3e
remove old p4->git import history
2009-12-08 14:02:18 -08:00
c7b8601d49
am b1665953: am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2
...
Merge commit 'b16659533e55476bbe2c0b177943ef8f4129e34a'
* commit 'b16659533e55476bbe2c0b177943ef8f4129e34a':
Add clean step for switching GPS API from pdapi to loc_api
2009-12-07 18:32:14 -08:00
0be5c863a2
am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
...
Merge commit 'a2496682f9c6f9311199df7300bb8e16298cf40d' into eclair-mr2-plus-aosp
* commit 'a2496682f9c6f9311199df7300bb8e16298cf40d':
docs: add context coloring to code snippets with prettify script
2009-12-07 16:39:04 -08:00
a2496682f9
am 9b0ad4c7: Merge change I79580117 into eclair
...
Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-mr2
* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
docs: add context coloring to code snippets with prettify script
2009-12-07 16:34:01 -08:00
7fd7dc46f5
am 9b0ad4c7: Merge change I79580117 into eclair
...
Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-plus-aosp
* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
docs: add context coloring to code snippets with prettify script
2009-12-07 16:33:18 -08:00
9b0ad4c725
Merge change I79580117 into eclair
...
* changes:
docs: add context coloring to code snippets with prettify script
2009-12-07 16:29:47 -08:00
b3be6d72a1
am fe8ab167: am e15968b4: Clean step for the move of SearchableInfo to android.app
...
Merge commit 'fe8ab167caa0fb93d068a6f93932f9ce3115c327'
* commit 'fe8ab167caa0fb93d068a6f93932f9ce3115c327':
Clean step for the move of SearchableInfo to android.app
2009-12-07 14:58:53 -08:00
8c704cc750
am e1f8ec91: am 56a01cbb: am e81271f5: Merge change Id97eba9f into eclair
...
Merge commit 'e1f8ec918e5e257feb0f6d1fcdf984ec7e591830'
* commit 'e1f8ec918e5e257feb0f6d1fcdf984ec7e591830':
don't add "ota-rel-keys" tag to build fingerprints
2009-12-07 14:58:50 -08:00
b16659533e
am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2
...
Merge commit '623a5572e894c2114767f5631165354076d0b139' into eclair-mr2-plus-aosp
* commit '623a5572e894c2114767f5631165354076d0b139':
Add clean step for switching GPS API from pdapi to loc_api
2009-12-07 08:09:53 -08:00
623a5572e8
resolved conflicts for merge of 882ad42e to eclair-mr2
...
Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587
2009-12-07 10:52:22 -05:00
4d523a163a
am 882ad42e: Add clean step for switching GPS API from pdapi to loc_api
...
Merge commit '882ad42e0de35d86f2361867e3efc497002b73e6' into eclair-plus-aosp
* commit '882ad42e0de35d86f2361867e3efc497002b73e6':
Add clean step for switching GPS API from pdapi to loc_api
2009-12-07 07:34:43 -08:00
882ad42e0d
Add clean step for switching GPS API from pdapi to loc_api
...
Change-Id: Ifa75b0865b547f5e643a4466f13ec7485e902e5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-07 07:23:25 -05:00
fe8ab167ca
am e15968b4: Clean step for the move of SearchableInfo to android.app
...
Merge commit 'e15968b47a30fb6411a682ac06a5d93ea89011b0' into eclair-mr2-plus-aosp
* commit 'e15968b47a30fb6411a682ac06a5d93ea89011b0':
Clean step for the move of SearchableInfo to android.app
2009-12-05 12:38:22 -08:00
e1f8ec918e
am 56a01cbb: am e81271f5: Merge change Id97eba9f into eclair
...
Merge commit '56a01cbb5cc11bedeef2f033fc31e370c7401f4a' into eclair-mr2-plus-aosp
* commit '56a01cbb5cc11bedeef2f033fc31e370c7401f4a':
don't add "ota-rel-keys" tag to build fingerprints
2009-12-05 12:38:19 -08:00
e15968b47a
Clean step for the move of SearchableInfo to android.app
...
This is part of http://b/issue?id=2270838
Change-Id: I4f70549f0a15e5c90fa5297a2af9f872bb5312a1
2009-12-05 18:24:52 +00:00
6c5a1ceed9
am 95137c3d: am 6c4a70c6: Merge change I672b05c4 into eclair-mr2
...
Merge commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e'
* commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e':
make build depend on event-log-tags file
2009-12-04 10:43:36 -08:00
Android Git Automerger