Commit graph

67593 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
Android (Google) Code Review
817a7ba786 Merge change 77
* changes:
  Squashed commit of the following:
2009-04-14 10:47:35 -07:00
Jianhong Jiang
7953e3000f Squashed commit of the following:
commit 191a8bc426782720b38d2af2151f654dc3241ffe
Author: Jianhong Jiang <jianhong@google.com>
Date:   Mon Apr 13 11:06:07 2009 -0700

    Change tabs into 4 spaces.

commit f47721ac22c353a93ddf56e3bd6ca21c01ad7091
Author: Jianhong Jiang <jianhong@google.com>
Date:   Fri Apr 10 14:14:05 2009 -0700

    OpenCore 2.02 prelink map change.
2009-04-13 18:58:11 -07:00
Raphael Moll
fa0c289563 Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:22:26 -07:00
Raphael Moll
a190c523af AI 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/...

Automated import of CL 145983
2009-04-13 18:21:16 -07:00
Joe Onorato
50d911553b Merge branch 'readonly-p4-master' 2009-04-13 16:33:27 -07:00
Joe Onorato
eb19b3e0d1 AI 146003: am: CL 145850 am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146003
2009-04-13 16:32:16 -07:00
Andy McFadden
801cfe2a50 Merge branch 'readonly-p4-master' 2009-04-13 14:49:50 -07:00
Andy McFadden
743e250b30 AI 145942: Enable type-precise GC on sapphire builds.
Automated import of CL 145942
2009-04-13 14:48:35 -07:00
Android (Google) Code Review
c3a92451bf Merge change 101
* changes:
  Make mmm stop if it can't find an Android.mk in a directory you give it.
2009-04-13 14:26:21 -07:00
Android (Google) Code Review
99eec76858 Merge change 92
* changes:
  Fix the warning about NOTICE files overriding previous targets.
2009-04-13 14:17:05 -07:00
Raphael Moll
a7bfb4f382 AI 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.
  BUG=1778786

Automated import of CL 145911
2009-04-13 12:53:33 -07:00
Joe Onorato
51e61829e7 Make mmm stop if it can't find an Android.mk in a directory you give it. 2009-04-13 15:36:15 -04:00
Patrick Scott
de62bb3da9 Merge branch 'readonly-p4-master' 2009-04-13 09:59:01 -07:00
Patrick Scott
991a6b5777 AI 145870: Add a build property for the default alarm alert. Update the various
framework classes to deal with the new property. Also update various
  documentation that mentions the default ringtones.
  Use the build property as the default alert when the user has not chosen
  an alert for an alarm. This is also used if the alarm alert is null when
  the alarm fires.
  BUG=1723684

Automated import of CL 145870
2009-04-13 09:57:37 -07:00
Joe Onorato
681925681a Fix the warning about NOTICE files overriding previous targets.
Use a different name for prebuilt libraries based on their LOCAL_MODULE --
they were all colliding using the same name, javalib.jar.  These names
are synthetic, since the libraries don't actually exist on the device
as such.
2009-04-13 12:51:43 -04:00
Joe Onorato
c08920685b Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:32:27 -07:00
Joe Onorato
03fbe40d53 AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145850
2009-04-13 08:31:16 -07:00
Grace Kloba
a935fc13ec Merge branch 'readonly-p4-master' 2009-04-10 18:38:17 -07:00
Grace Kloba
afd5902962 AI 145798: Add a clean step to clean libwebcore as we just got a new WebKit
Automated import of CL 145798
2009-04-10 18:37:08 -07:00
Jack Veenstra
4b2d1d5848 AI 145720: Fixed tracedmdump() by correcting the KERNEL path.
Merged 145709 from donut.
  BUG=1630077

Automated import of CL 145720
2009-04-10 11:23:09 -07:00
Jack Veenstra
16a98c0959 Merge branch 'readonly-p4-donut' into donut 2009-04-10 10:32:11 -07:00
Jack Veenstra
8f8b99c40a AI 145709: Fixed tracedmdump() by correcting the KERNEL path.
Merged 145592 from master.
  BUG=1630077

Automated import of CL 145709
2009-04-10 10:30:51 -07:00
Mike Lockwood
f22bf51669 Merge branch 'readonly-p4-master' 2009-04-10 06:36:47 -07:00
Mike Lockwood
c461d29404 Merge branch 'readonly-p4-donut' into donut 2009-04-10 06:36:10 -07:00
Mike Lockwood
ed8b386128 AI 145705: am: CL 145704 Manually integrate change 145576 to donutburger to fix "lunch"
Original author: lockwood

Automated import of CL 145705
2009-04-10 06:35:35 -07:00
Mike Lockwood
8539929a12 AI 145704: Manually integrate change 145576 to donutburger to fix "lunch"
Automated import of CL 145704
2009-04-10 06:34:59 -07:00
Xavier Ducrohet
9adda234ae Merge branch 'readonly-p4-master' 2009-04-09 20:47:45 -07:00
Xavier Ducrohet
0688ae9879 AI 145660: am: CL 145622 am: CL 145380 Fixes for add-on build
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145660
2009-04-09 20:46:34 -07:00
Joe Onorato
44a48f7d77 Merge branch 'readonly-p4-master' 2009-04-09 20:45:06 -07:00
Joe Onorato
4c096ad580 AI 145659: am: CL 145621 am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145659
2009-04-09 20:43:57 -07:00
Joe Onorato
fbac5ec731 Merge branch 'readonly-p4-master' 2009-04-09 20:37:13 -07:00
Joe Onorato
214a42bbb6 AI 145655: am: CL 145618 am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145655
2009-04-09 20:36:06 -07:00
Xavier Ducrohet
cb6dae2336 Merge branch 'readonly-p4-donut' into donut 2009-04-09 19:43:23 -07:00
Xavier Ducrohet
706a9a0a02 AI 145622: am: CL 145380 Fixes for add-on build
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 145622
2009-04-09 19:42:09 -07:00
Joe Onorato
4c2a4c3b55 Merge branch 'readonly-p4-donut' into donut 2009-04-09 19:40:30 -07:00
Joe Onorato
92f8a3a7c3 AI 145621: am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145621
2009-04-09 19:39:15 -07:00
Joe Onorato
1c38b9c493 Merge branch 'readonly-p4-donut' into donut 2009-04-09 19:32:25 -07:00
Joe Onorato
64d85d0d82 AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145618
2009-04-09 19:31:12 -07:00
Jack Veenstra
c6c4db56eb Merge branch 'readonly-p4-master' 2009-04-09 18:13:45 -07:00
Jack Veenstra
60116fc2cb AI 145592: Fixed the tracedmdump() bash function to use the correct path for the vmlinux-qemu file.
BUG=1630077

Automated import of CL 145592
2009-04-09 18:12:34 -07:00