Commit graph

136 commits

Author SHA1 Message Date
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
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
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
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
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
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
Mike Lockwood
f22bf51669 Merge branch 'readonly-p4-master' 2009-04-10 06:36:47 -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
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
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
Xavier Ducrohet
1f5e496db1 Merge branch 'readonly-p4-master' 2009-04-09 14:07:57 -07:00
Xavier Ducrohet
b460083dbf AI 145486: am: CL 145464 am: CL 145080 Add Latin and Chinese method to SDK.
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145486
2009-04-09 14:06:37 -07:00
Jean-Baptiste Queru
e34380bea4 revert prelink map to match OpenCORE 1.0 2009-04-08 14:38:13 -07:00
Ravi K Yenduri
be8708351a Enable OpenCORE on master - part 3 2009-04-08 14:37:50 -07:00
Cary Clark
626ef903c7 Merge branch 'readonly-p4-master' 2009-04-08 08:10:46 -07:00
Cary Clark
2a66f06927 AI 145053: add SVG to the browser [disabled by default]
To enable SVG, edit your buildspec.mk to
  ENABLE_SVG:=true
  then
  make clean-libwebcore && make
  Some SVG functionality has been stubbed out in this checkin.
  //branches/master/android/build/buildspec.mk.default	# edit
  - add ENABLE_SVG, commented out by default
  - fix up WEBCORE_INSTRUMENTATION define while I was in there
  //branches/master/android/external/webkit/Android.mk	# edit
  - add ENABLE_SVG C define
  - add svg paths to C includes
  //branches/master/android/external/webkit/WebCore/Android.derived.mk	# edit
  - update merge tool rules
  - add svg to css property names, keywords, generated bindings
  - add svg names, element factory, wrappers
  - remove obsolete ksvgcssproperties.h
  - add XLinkNames, required by SVG
  //branches/master/android/external/webkit/WebCore/Android.mk	# edit
  - update merge tool rules
  - add svg bindings, css svg parsing, svg rendering, svg engine
  //branches/master/android/external/webkit/WebCore/config.h	# edit
  - leave ENABLE_SVG alone if it is already defined
  //branches/master/android/external/webkit/WebCore/loader/EmptyClients.h	# edit
  - add some Android extensions as empty virtuals (EmptyClients is only used by SVG)
  //branches/master/android/external/webkit/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp	# edit
  //branches/master/android/external/webkit/WebCore/platform/graphics/android/PathAndroid.cpp	# edit
  - add SVG graphics porting functions. Note the FIXMEs -- some are unimplemented.
  BUG=1474412

Automated import of CL 145053
2009-04-08 08:09:31 -07:00
Xavier Ducrohet
8f9b9d52fd Merge branch 'readonly-p4-master' 2009-04-06 20:33:25 -07:00
Xavier Ducrohet
f3e79f9041 AI 144767: am: CL 144765 am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144767
2009-04-06 20:32:24 -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
Andy Stadler
b524d5bacc Merge branch 'readonly-p4-master' 2009-04-02 22:45:25 -07:00
Andy Stadler
409e0a907d AI 144393: am: CL 144253 Cleanstep for gsm related errors.
Original author: stadler

Automated import of CL 144393
2009-04-02 22:44:11 -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
Doug Zongker
d9290f2a0f Merge branch 'readonly-p4-master' 2009-04-02 10:21:16 -07:00
Doug Zongker
32a27c8577 AI 144157: Manually integrate 144143 from donut to fix build.
Automated import of CL 144157
2009-04-02 10:20:05 -07:00
Doug Zongker
06f93798f4 Merge branch 'readonly-p4-master' 2009-04-02 10:13:30 -07:00
Doug Zongker
7cb8e199b4 AI 144132: am: CL 144130 Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image.  Use the
  test-keys for all builds.
  Original author: dougz
  Merged from: //branches/donutburger/...

Automated import of CL 144132
2009-04-02 10:12:24 -07:00