Commit graph

1406 commits

Author SHA1 Message Date
Dirk Dougherty
f481f53de2 AI 146347: am: CL 146344 g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146347
2009-04-15 11:40:10 -07:00
Dirk Dougherty
6080c87c31 Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:37:52 -07:00
Dirk Dougherty
b8f2e76e29 AI 146346: am: CL 146342 g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146346
2009-04-15 11:36:34 -07:00
Dirk Dougherty
a744f1b5a5 AI 146344: g4 integrate -t -i -b platform-1_0-to-cupcake @143529,143529 (doc change)
BUG=1675368

Automated import of CL 146344
2009-04-15 11:32:45 -07:00
Dirk Dougherty
18467173e5 AI 146342: g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
BUG=1675368

Automated import of CL 146342
2009-04-15 11:31:36 -07:00
The Android Open Source Project
e53ceac5e2 Merge commit 'korg/cupcake' 2009-04-14 18:17:59 -07:00
Doug Zongker
43874f8c86 make unsigned apks explicit
Allow user to explicitly specify that an apk is not to be
re-signed. Fail if we have any apks that for which no key is provided.
2009-04-14 17:12:20 -07:00
Doug Zongker
547c8cfa7d Merge branch 'readonly-p4-donut' into donut 2009-04-14 12:35:46 -07:00
Doug Zongker
ad88c7ce4f AI 146194: am: CL 146193 Fix signing script so keys specified in -e options get passed
through the key map.  Clarify the help for the -e option to
  make clear this should happen.
  (This change doesn't affect device code.)
  Original author: dougz
  Merged from: //branches/cupcake/...

Automated import of CL 146194
2009-04-14 12:34:27 -07:00
Doug Zongker
8c61c301b2 AI 146193: Fix signing script so keys specified in -e options get passed
through the key map.  Clarify the help for the -e option to
  make clear this should happen.
  (This change doesn't affect device code.)

Automated import of CL 146193
2009-04-14 12:33:31 -07:00
Doug Zongker
8e931bf999 update the cert used for OTA verification when signing
The build system now (in donut) produces builds that use the testkey
cert for OTA package verification.  Change the app-signing script to
also optionally substitute the "real" cert in both the recovery and
system images.  Also fix bug where the build fingerprint and
description were not getting properly updated in the recovery
partition.
2009-04-06 15:21:45 -07:00
Sean McNeil
19ea2a8843 Cleanup output when searching for leaves. Don't want to see things like warnings of looping symlinks. 2009-04-04 18:46:15 +07:00
Doug Zongker
2c7cc50c74 Merge branch 'readonly-p4-master' 2009-04-02 23:00:43 -07:00
Doug Zongker
dbfb20ccd8 AI 144399: am: CL 144270 am: CL 144269 Relocate the new (google-indepedent) tools for signing and
building images & OTA packages out of vendor/google.
  No device code is touched by this change.
  Original author: dougz
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144399
2009-04-02 22:59:40 -07:00
Doug Zongker
eef3944eb3 AI 144270: am: CL 144269 Relocate the new (google-indepedent) tools for signing and
building images & OTA packages out of vendor/google.
  No device code is touched by this change.
  Original author: dougz
  Merged from: //branches/cupcake/...

Automated import of CL 144270
2009-04-02 12:14:19 -07:00
Doug Zongker
ad44c07ac7 AI 144269: Relocate the new (google-indepedent) tools for signing and
building images & OTA packages out of vendor/google.
  No device code is touched by this change.
  BUG=1753409

Automated import of CL 144269
2009-04-02 12:10:46 -07:00
Mike Ritter
ad22128be8 Merge branch 'readonly-p4-master' 2009-04-02 10:37:54 -07:00
Mike Ritter
c47ae940ee AI 144207: am: CL 144166 am: CL 144164 Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
Original author: mritter
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144207
2009-04-02 10:36:49 -07:00
Mike Ritter
032e32a012 AI 144166: am: CL 144164 Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
Original author: mritter
  Merged from: //branches/cupcake/...

Automated import of CL 144166
2009-04-02 01:26:29 -07:00
Mike Ritter
6c4cd9e035 AI 144164: Adding droiddocs/javadocs usage to Pdk-docs to get correct style.
BUG=1646802

Automated import of CL 144164
2009-04-01 17:30:12 -07:00
The Android Open Source Project
8ac438f110 Merge branch 'open_source' into google_internal
Conflicts:
	core/build_id.mk
2009-03-29 08:55:26 -07:00
The Android Open Source Project
1379256b55 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
Iliyan Malchev
c87cb75a66 Automated import from //branches/master/...@142824,142824 2009-03-25 18:09:52 -07:00
Iliyan Malchev
bafa6ddfc5 Automated import from //branches/donutburger/...@141285,141285 2009-03-24 19:58:48 -07:00
Iliyan Malchev
9020995de4 Automated import from //branches/master/...@141287,141287 2009-03-24 19:58:46 -07:00
Dianne Hackborn
cd44e5400f Automated import from //branches/donutburger/...@140818,140818 2009-03-24 18:36:43 -07:00
Dianne Hackborn
15e0f1afee Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:42 -07:00
The Android Open Source Project
b87fef6336 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:36 -07:00
Edward Hervey
4cd3f74003 findleaves.sh: Properly fix arguments.
the first argument is the executable (here findleaves.sh), therefore we
need to start popping from the 2nd argument (1).
2009-03-19 12:32:04 +01:00
The Android Open Source Project
f122bec404 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:42 -07:00
Jean-Baptiste Queru
ccf4b83b02 Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Conflicts:
	core/prelink-linux-arm.map
2009-03-18 16:58:18 -07:00
The Android Open Source Project
6bce205856 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:19 -07:00
The Android Open Source Project
fdd3a1020c auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
The Android Open Source Project
2f31293ba7 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
094268cf8c auto import from //depot/cupcake/@132589 2009-03-03 14:03:52 -08:00
The Android Open Source Project
a9b2249753 auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
aurelien...@free.fr
2f49d59369 Add support for symbolic links for product folders
Fixes http://code.google.com/p/android/issues/detail?id=2116
2009-03-02 10:54:28 -08:00
The Android Open Source Project
4d23ccc023 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:28 -08:00
The Android Open Source Project
41977d7cd2 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
The Android Open Source Project
dca10d536d auto import from //branches/cupcake/...@131421 2009-02-13 12:57:48 -08:00
The Android Open Source Project
475fa12ade auto import from //branches/cupcake/...@130745 2009-02-10 15:43:57 -08:00
The Android Open Source Project
e914857b89 Merge branch 'cupcake' 2009-01-20 14:05:22 -08:00
The Android Open Source Project
ed18741e07 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -08:00
The Android Open Source Project
a71fc0a155 Merge branch 'master' of git://android.git.kernel.org/platform/build 2009-01-16 14:38:53 -08:00
android-build SharedAccount
0c2b8bfb87 Merge branch 'cupcake' 2009-01-15 16:15:46 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
Mike Hearn
5496ad284d Don't walk the inheritance heirarchy looking for deprecated superclasses.
It makes no sense that a class would become deprecated because its superclass
became deprecated - this resulted in nonsensical deprecation warnings for
classes that weren't actually deprecated, like WebView, simply because they
inherited from something that was.
2009-01-14 17:27:57 +01:00
The Android Open Source Project
70b813ec57 auto import from //branches/cupcake/...@125939 2009-01-09 18:27:30 -08:00
The Android Open Source Project
4f85cc54b3 auto import from //branches/cupcake/...@125939 2009-01-09 17:50:54 -08:00
Jean-Baptiste Queru
179d2bf01a Merge commit 'remotes/korg/cupcake'
Conflicts:
	core/api/1.xml
	core/api/current.xml
	core/main.mk
2008-12-19 07:58:19 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
Christopher Tate
824b6963bd Use a typed comparison of floating point field values rather than just a string comparison.
This addresses toolchain issues; see http://code.google.com/p/android/issues/detail?id=994
2008-10-22 20:23:11 -07:00
Alexey Zaytsev
8ae3ad5802 Add a few missing headers.
Fixes build with gcc 4.3.2 on Debian.

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
2008-10-22 02:02:30 +04:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00