Commit Graph

1574 Commits

Author SHA1 Message Date
Android (Google) Code Review 5125e441b1 Merge change If6a53aa5
* changes:
  add "EXTERNAL" as special value of LOCAL_CERTIFICATE
2009-12-15 15:51:10 -08:00
Doug Zongker f6a53aa5f2 add "EXTERNAL" as special value of LOCAL_CERTIFICATE
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing.  (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
2009-12-15 15:06:55 -08:00
Xavier Ducrohet ea90f240b8 am 6f6b2090: am 920f2aae: Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit '6f6b2090cfb981b0c52b0c9271753968a6e94cc2'

* commit '6f6b2090cfb981b0c52b0c9271753968a6e94cc2':
  Add the LiveWallpaper sample as prebuilt to the SDK system image.
2009-12-15 15:05:54 -08:00
Xavier Ducrohet e035d596cd am 374909f6: am fac84b56: Merge change Icb5cf14e into eclair
Merge commit '374909f68a78941909ecd0b6a329822fdd01cac5'

* commit '374909f68a78941909ecd0b6a329822fdd01cac5':
  Add feature list support to DroidDoc.
2009-12-15 15:03:19 -08:00
Xavier Ducrohet 01409791bb am c1cd624b: am 88f254bf: Add gallery to the SDK build now that it\'s split from the Camera app.
Merge commit 'c1cd624b3a4c0528ea386a12f20b6049f12c3858'

* commit 'c1cd624b3a4c0528ea386a12f20b6049f12c3858':
  Add gallery to the SDK build now that it's split from the Camera app.
2009-12-15 15:03:15 -08:00
Dirk Dougherty 12b61a9824 am 7b0e85e1: am 502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '7b0e85e1814376286c7d036f73241f9a19f70b08'

* commit '7b0e85e1814376286c7d036f73241f9a19f70b08':
  sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
2009-12-15 15:03:11 -08:00
Xavier Ducrohet 6f6b2090cf am 920f2aae: Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit '920f2aaee64cc21f00d712ba17a1dded02ccff6b' into eclair-plus-aosp

* commit '920f2aaee64cc21f00d712ba17a1dded02ccff6b':
  Add the LiveWallpaper sample as prebuilt to the SDK system image.
2009-12-15 10:33:15 -08:00
Xavier Ducrohet 374909f68a am fac84b56: Merge change Icb5cf14e into eclair
Merge commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp

* commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c':
  Add feature list support to DroidDoc.
2009-12-15 07:42:24 -08:00
Xavier Ducrohet c1cd624b3a am 88f254bf: Add gallery to the SDK build now that it\'s split from the Camera app.
Merge commit '88f254bf55b8a78921d94f40e3bcc9c25a348570' into eclair-plus-aosp

* commit '88f254bf55b8a78921d94f40e3bcc9c25a348570':
  Add gallery to the SDK build now that it's split from the Camera app.
2009-12-15 07:41:17 -08:00
Dirk Dougherty 7b0e85e181 am 502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp

* commit '502c498fec23cb28d16f5e86e981400f76da36ea':
  sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
2009-12-15 07:38:57 -08:00
Android Git Automerger bfa7a8fbda Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:44:45 -08:00
Xavier Ducrohet 920f2aaee6 Add the LiveWallpaper sample as prebuilt to the SDK system image.
Change-Id: I5a1b0d2e383b757e52879792ee80dbd61f97f9a4
2009-12-14 22:37:13 -08:00
Android (Google) Code Review fac84b5611 Merge change Icb5cf14e into eclair
* changes:
  Add feature list support to DroidDoc.
2009-12-14 18:20:10 -08:00
Xavier Ducrohet f9b6d38d07 Add feature list support to DroidDoc.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.

This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)

Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
2009-12-14 17:55:05 -08:00
Xavier Ducrohet 88f254bf55 Add gallery to the SDK build now that it's split from the Camera app.
Bug: 2275030
Change-Id: Iad74a37d0df1d77185062cb4323665be7185c242
2009-12-14 16:47:25 -08:00
Doug Zongker 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
Doug Zongker 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
Doug Zongker 714111cbdd include pre-signed prebuilt .apks in apkcerts.txt 2009-12-14 10:14:46 -08:00
Dirk Dougherty 502c498fec sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Bug: 2160782
Change-Id: I5c45bdf4861ba2dc150e95d5523367a14b401304
2009-12-11 20:54:08 -08:00
Doug Zongker 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
Doug Zongker 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
Android (Google) Code Review 9bc88726cb Merge change I45302ff0 into eclair-mr2
* changes:
  make prebuilt .apks require LOCAL_CERTIFICATE
2009-12-11 14:50:33 -08:00
Doug Zongker 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
Scott Main 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
Ying Wang 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
Scott Main 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
Ying Wang 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
Scott Main 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
Ying Wang 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
Doug Zongker 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
Doug Zongker 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
Doug Zongker 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
Doug Zongker 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
Doug Zongker 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
Doug Zongker 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
Android (Google) Code Review fe8ff19a2a Merge change Ief993a27 into eclair-mr2
* changes:
  add signing checker script to releasetools
2009-12-10 09:37:19 -08:00
Jean-Baptiste Queru d20ccb2361 manual merge 2009-12-10 09:31:38 -08:00
Scott Main 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
Android (Google) Code Review 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
Scott Main 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
Doug Zongker 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
Jean-Baptiste Queru 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
Jean-Baptiste Queru 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
Ying Wang 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
Ying Wang 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
Doug Zongker 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
Doug Zongker 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
Jean-Baptiste Queru 3a59b2ceb9 Remove Google-specific files
Also remove unused configuration
2009-12-08 15:11:04 -08:00
Scott Main 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
Jean-Baptiste Queru 6254132a3e remove old p4->git import history 2009-12-08 14:02:18 -08:00