Commit graph

55432 commits

Author SHA1 Message Date
Android (Google) Code Review
72611ece86 Merge change 362 into donut
* changes:
  generalize -t option to add and remove tags in fingerprints
2009-04-21 16:06:17 -07:00
Doug Zongker
ae877013ab generalize -t option to add and remove tags in fingerprints
To support devphone and holiday builds we need more control over the
build fingerprint tags; generalize the -t option so we can arbitrarily
add and remove tags.
2009-04-21 15:56:42 -07:00
Xavier Ducrohet
b1cccefdb7 Merge branch 'readonly-p4-master' 2009-04-21 13:39:33 -07:00
Xavier Ducrohet
62c503c173 AI 147203: am: CL 147198 am: CL 147197 Adds calculator to sdk build.
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147203
2009-04-21 13:38:15 -07:00
Xavier Ducrohet
8d796b09e8 Merge branch 'readonly-p4-donut' into donut 2009-04-21 13:36:38 -07:00
Xavier Ducrohet
b448af348d AI 147198: am: CL 147197 Adds calculator to sdk build.
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 147198
2009-04-21 13:35:21 -07:00
Xavier Ducrohet
48db652e97 AI 147197: Adds calculator to sdk build.
BUG=1803455

Automated import of CL 147197
2009-04-21 13:35:03 -07:00
Dirk Dougherty
bf6823b468 Merge branch 'readonly-p4-donut' into donut 2009-04-21 01:01:23 -07:00
Dirk Dougherty
8a81cce630 AI 147054: am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
  Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 147054
2009-04-21 01:00:11 -07:00
Dirk Dougherty
e7b6e882e5 Merge branch 'readonly-p4-master' 2009-04-20 17:58:00 -07:00
Dirk Dougherty
911e311e4e AI 147058: am: CL 147054 am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
  Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147058
2009-04-20 17:56:31 -07:00
Dirk Dougherty
82ed8f8c5e AI 147053: Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
  BUG=1790234

Automated import of CL 147053
2009-04-20 17:54:49 -07:00
Android (Google) Code Review
141f3adb8b Merge change 268 into donut
* changes:
  add option to modify build fingerprint tags when signing
2009-04-20 12:11:35 -07:00
Scott Main
7280e2d2e3 Merge branch 'readonly-p4-master' 2009-04-20 11:19:35 -07:00
Scott Main
9cccd821ca AI 146955: am: CL 146953 am: CL 146951 CSS edits for docs;
remove preliminary watermark;
  remove red color text for warnings;
  delete the caution class;
  use 1em top-margin only for elements nested in a DD, elements nested in regular
  LIs should only be a half em.
  Original author: smain
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146955
2009-04-20 11:18:15 -07:00
Scott Main
65504ff4e9 Merge branch 'readonly-p4-donut' into donut 2009-04-20 11:17:51 -07:00
Scott Main
abfeaa094d AI 146953: am: CL 146951 CSS edits for docs;
remove preliminary watermark;
  remove red color text for warnings;
  delete the caution class;
  use 1em top-margin only for elements nested in a DD, elements nested in regular
  LIs should only be a half em.
  Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 146953
2009-04-20 11:16:42 -07:00
Scott Main
9e54130f3d AI 146951: CSS edits for docs;
remove preliminary watermark;
  remove red color text for warnings;
  delete the caution class;
  use 1em top-margin only for elements nested in a DD, elements nested in regular
  LIs should only be a half em.
  BUG=1798190

Automated import of CL 146951
2009-04-20 11:15:26 -07:00
Urs Grob
8e5df6c024 Merge branch 'readonly-p4-master' 2009-04-18 22:45:40 -07:00
Urs Grob
4a27b76491 AI 146827: am: CL 146742 am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  Original author: ursg
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146827
2009-04-18 22:44:31 -07:00
Joe Onorato
c09cd34bee Merge branch 'readonly-p4-master' 2009-04-18 22:37:32 -07:00
Joe Onorato
7ee52de5c3 AI 146824: am: CL 146738 am: CL 146687 The maps and gtalkservice libraries were still being included in
all of the builds.  Fix that.
  We really need to get this generic_with_google product out of
  build/target and into vendor/google, but that can come later.
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146824
2009-04-18 22:36:21 -07:00
Dirk Dougherty
1c632f9e73 Merge branch 'readonly-p4-master' 2009-04-18 21:16:22 -07:00
Dirk Dougherty
eb1bbbec81 AI 146575: am: CL 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/...
  Original author: android-build

Automated import of CL 146575
2009-04-18 21:15:08 -07:00
Dirk Dougherty
ed214869ec Merge branch 'readonly-p4-master' 2009-04-18 21:13:35 -07:00
Dirk Dougherty
ecfc2c0285 AI 146574: am: CL 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/...
  Original author: android-build

Automated import of CL 146574
2009-04-18 21:12:27 -07:00
Doug Zongker
add1f5e56d Merge branch 'readonly-p4-master' 2009-04-18 15:42:29 -07:00
Doug Zongker
1928af7eb6 AI 146544: am: CL 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/...
  Original author: android-build

Automated import of CL 146544
2009-04-18 15:41:18 -07:00
Urs Grob
1d4cd96f69 Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:28:20 -07:00
Urs Grob
b3c6b2df48 AI 146742: am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  Original author: ursg
  Merged from: //branches/cupcake/...

Automated import of CL 146742
2009-04-17 11:27:08 -07:00
Joe Onorato
a8643300df Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:16:46 -07:00
Joe Onorato
30663a2d1a AI 146738: am: CL 146687 The maps and gtalkservice libraries were still being included in
all of the builds.  Fix that.
  We really need to get this generic_with_google product out of
  build/target and into vendor/google, but that can come later.
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 146738
2009-04-17 11:15:32 -07:00
Doug Zongker
17aa944001 add option to modify build fingerprint tags when signing
Adds the -t option to sign_target_files_apks, which lets the user
specify extra tags that should be added to the build fingerprint
during the signing process.
2009-04-17 10:15:58 -07:00
Urs Grob
709b752e3b AI 146710: Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  BUG=1789657

Automated import of CL 146710
2009-04-17 02:07:14 -07:00
Joe Onorato
f32686a3e2 AI 146687: The maps and gtalkservice libraries were still being included in
all of the builds.  Fix that.
  We really need to get this generic_with_google product out of
  build/target and into vendor/google, but that can come later.
  BUG=1786404

Automated import of CL 146687
2009-04-16 19:15:49 -07:00
Raphael Moll
1032d83d51 Merge branch 'readonly-p4-master' 2009-04-16 10:55:25 -07:00
Raphael Moll
a779a05e7e AI 146498: am: CL 145983 am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146498
2009-04-16 10:54:10 -07:00
Doug Zongker
3f2933b209 add check mode to zipalign
Add a -c flag to zipalign to do nothing but check the input zip file
for alignment (with or without verbosity).
2009-04-16 10:16:38 -07:00
Dirk Dougherty
37640799e6 Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:41:27 -07:00
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
Android (Google) Code Review
817a7ba786 Merge change 77
* changes:
  Squashed commit of the following:
2009-04-14 10:47:35 -07:00