Commit Graph

7575 Commits

Author SHA1 Message Date
7280e2d2e3 Merge branch 'readonly-p4-master' 2009-04-20 11:19:35 -07:00
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
65504ff4e9 Merge branch 'readonly-p4-donut' into donut 2009-04-20 11:17:51 -07:00
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
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
c09cd34bee Merge branch 'readonly-p4-master' 2009-04-18 22:37:32 -07:00
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
1c632f9e73 Merge branch 'readonly-p4-master' 2009-04-18 21:16:22 -07:00
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
ed214869ec Merge branch 'readonly-p4-master' 2009-04-18 21:13:35 -07:00
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
add1f5e56d Merge branch 'readonly-p4-master' 2009-04-18 15:42:29 -07:00
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
a8643300df Merge branch 'readonly-p4-donut' into donut 2009-04-17 11:16:46 -07:00
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
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
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
37640799e6 Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:41:27 -07:00
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
6080c87c31 Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:37:52 -07:00
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
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
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
547c8cfa7d Merge branch 'readonly-p4-donut' into donut 2009-04-14 12:35:46 -07:00
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
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
2c7cc50c74 Merge branch 'readonly-p4-master' 2009-04-02 23:00:43 -07:00
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
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
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
ad22128be8 Merge branch 'readonly-p4-master' 2009-04-02 10:37:54 -07:00
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
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
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
c87cb75a66 Automated import from //branches/master/...@142824,142824 2009-03-25 18:09:52 -07:00
bafa6ddfc5 Automated import from //branches/donutburger/...@141285,141285 2009-03-24 19:58:48 -07:00
9020995de4 Automated import from //branches/master/...@141287,141287 2009-03-24 19:58:46 -07:00
cd44e5400f Automated import from //branches/donutburger/...@140818,140818 2009-03-24 18:36:43 -07:00
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