OSDN Git Service
Joe Onorato [Sun, 19 Apr 2009 05:37:32 +0000 (22:37 -0700)]
Merge branch 'readonly-p4-master'
Joe Onorato [Sun, 19 Apr 2009 05:36:21 +0000 (22:36 -0700)]
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
Dirk Dougherty [Sun, 19 Apr 2009 04:16:22 +0000 (21:16 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Sun, 19 Apr 2009 04:15:08 +0000 (21:15 -0700)]
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
Dirk Dougherty [Sun, 19 Apr 2009 04:13:35 +0000 (21:13 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Sun, 19 Apr 2009 04:12:27 +0000 (21:12 -0700)]
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
Doug Zongker [Sat, 18 Apr 2009 22:42:29 +0000 (15:42 -0700)]
Merge branch 'readonly-p4-master'
Doug Zongker [Sat, 18 Apr 2009 22:41:18 +0000 (15:41 -0700)]
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
Raphael Moll [Thu, 16 Apr 2009 17:55:25 +0000 (10:55 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Thu, 16 Apr 2009 17:54:10 +0000 (10:54 -0700)]
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
Android (Google) Code Review [Tue, 14 Apr 2009 17:47:35 +0000 (10:47 -0700)]
Merge change 77
* changes:
Squashed commit of the following:
Jianhong Jiang [Tue, 14 Apr 2009 01:58:11 +0000 (18:58 -0700)]
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.
Joe Onorato [Mon, 13 Apr 2009 23:33:27 +0000 (16:33 -0700)]
Merge branch 'readonly-p4-master'
Joe Onorato [Mon, 13 Apr 2009 23:32:16 +0000 (16:32 -0700)]
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
Andy McFadden [Mon, 13 Apr 2009 21:49:50 +0000 (14:49 -0700)]
Merge branch 'readonly-p4-master'
Andy McFadden [Mon, 13 Apr 2009 21:48:35 +0000 (14:48 -0700)]
AI 145942: Enable type-precise GC on sapphire builds.
Automated import of CL 145942
Android (Google) Code Review [Mon, 13 Apr 2009 21:26:21 +0000 (14:26 -0700)]
Merge change 101
* changes:
Make mmm stop if it can't find an Android.mk in a directory you give it.
Android (Google) Code Review [Mon, 13 Apr 2009 21:17:05 +0000 (14:17 -0700)]
Merge change 92
* changes:
Fix the warning about NOTICE files overriding previous targets.
Joe Onorato [Mon, 13 Apr 2009 19:36:15 +0000 (15:36 -0400)]
Make mmm stop if it can't find an Android.mk in a directory you give it.
Patrick Scott [Mon, 13 Apr 2009 16:59:01 +0000 (09:59 -0700)]
Merge branch 'readonly-p4-master'
Patrick Scott [Mon, 13 Apr 2009 16:57:37 +0000 (09:57 -0700)]
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
Joe Onorato [Mon, 13 Apr 2009 16:51:43 +0000 (12:51 -0400)]
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.
Grace Kloba [Sat, 11 Apr 2009 01:38:17 +0000 (18:38 -0700)]
Merge branch 'readonly-p4-master'
Grace Kloba [Sat, 11 Apr 2009 01:37:08 +0000 (18:37 -0700)]
AI 145798: Add a clean step to clean libwebcore as we just got a new WebKit
Automated import of CL 145798
Mike Lockwood [Fri, 10 Apr 2009 13:36:47 +0000 (06:36 -0700)]
Merge branch 'readonly-p4-master'
Mike Lockwood [Fri, 10 Apr 2009 13:35:35 +0000 (06:35 -0700)]
AI 145705: am: CL 145704 Manually integrate change 145576 to donutburger to fix "lunch"
Original author: lockwood
Automated import of CL 145705
Xavier Ducrohet [Fri, 10 Apr 2009 03:47:45 +0000 (20:47 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Fri, 10 Apr 2009 03:46:34 +0000 (20:46 -0700)]
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
Joe Onorato [Fri, 10 Apr 2009 03:45:06 +0000 (20:45 -0700)]
Merge branch 'readonly-p4-master'
Joe Onorato [Fri, 10 Apr 2009 03:43:57 +0000 (20:43 -0700)]
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
Joe Onorato [Fri, 10 Apr 2009 03:37:13 +0000 (20:37 -0700)]
Merge branch 'readonly-p4-master'
Joe Onorato [Fri, 10 Apr 2009 03:36:06 +0000 (20:36 -0700)]
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
Jack Veenstra [Fri, 10 Apr 2009 01:13:45 +0000 (18:13 -0700)]
Merge branch 'readonly-p4-master'
Jack Veenstra [Fri, 10 Apr 2009 01:12:34 +0000 (18:12 -0700)]
AI 145592: Fixed the tracedmdump() bash function to use the correct path for the vmlinux-qemu file.
BUG=
1630077
Automated import of CL 145592
Xavier Ducrohet [Thu, 9 Apr 2009 21:07:57 +0000 (14:07 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Thu, 9 Apr 2009 21:06:37 +0000 (14:06 -0700)]
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
Jean-Baptiste Queru [Wed, 8 Apr 2009 21:38:13 +0000 (14:38 -0700)]
revert prelink map to match OpenCORE 1.0
Ravi K Yenduri [Tue, 31 Mar 2009 19:11:26 +0000 (12:11 -0700)]
Enable OpenCORE on master - part 3
Cary Clark [Wed, 8 Apr 2009 15:10:46 +0000 (08:10 -0700)]
Merge branch 'readonly-p4-master'
Cary Clark [Wed, 8 Apr 2009 15:09:31 +0000 (08:09 -0700)]
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
Xavier Ducrohet [Tue, 7 Apr 2009 03:33:25 +0000 (20:33 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Tue, 7 Apr 2009 03:32:24 +0000 (20:32 -0700)]
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
Doug Zongker [Fri, 3 Apr 2009 06:00:43 +0000 (23:00 -0700)]
Merge branch 'readonly-p4-master'
Doug Zongker [Fri, 3 Apr 2009 05:59:40 +0000 (22:59 -0700)]
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
Andy Stadler [Fri, 3 Apr 2009 05:45:25 +0000 (22:45 -0700)]
Merge branch 'readonly-p4-master'
Andy Stadler [Fri, 3 Apr 2009 05:44:11 +0000 (22:44 -0700)]
AI 144393: am: CL 144253 Cleanstep for gsm related errors.
Original author: stadler
Automated import of CL 144393
Mike Ritter [Thu, 2 Apr 2009 17:37:54 +0000 (10:37 -0700)]
Merge branch 'readonly-p4-master'
Mike Ritter [Thu, 2 Apr 2009 17:36:49 +0000 (10:36 -0700)]
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
Doug Zongker [Thu, 2 Apr 2009 17:21:16 +0000 (10:21 -0700)]
Merge branch 'readonly-p4-master'
Doug Zongker [Thu, 2 Apr 2009 17:20:05 +0000 (10:20 -0700)]
AI 144157: Manually integrate 144143 from donut to fix build.
Automated import of CL 144157
Doug Zongker [Thu, 2 Apr 2009 17:13:30 +0000 (10:13 -0700)]
Merge branch 'readonly-p4-master'
Doug Zongker [Thu, 2 Apr 2009 17:12:24 +0000 (10:12 -0700)]
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
The Android Open Source Project [Wed, 1 Apr 2009 05:19:27 +0000 (22:19 -0700)]
Merge branch 'master' of git://android.git./platform/build
The Android Open Source Project [Wed, 1 Apr 2009 04:34:23 +0000 (21:34 -0700)]
Merge commit 'goog/readonly-p4-master'
Raphael Moll [Wed, 1 Apr 2009 00:20:53 +0000 (17:20 -0700)]
AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #
1640225)
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143880
Brett Chabot [Tue, 31 Mar 2009 21:41:33 +0000 (14:41 -0700)]
AI 143809: am: CL 143784 am: CL 143737 Fix kernel build: remove the '.' from runtest.py shortcut
Original author: brettchabot
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143809
Ravi K Yenduri [Tue, 31 Mar 2009 19:11:26 +0000 (12:11 -0700)]
Enable OpenCORE on master - part 3
Jean-Baptiste Queru [Fri, 27 Mar 2009 20:06:10 +0000 (13:06 -0700)]
Fix build: disable OpenCORE by default.
Fixes http://b.android.com/2308
This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
Jean-Baptiste Queru [Fri, 27 Mar 2009 20:06:10 +0000 (13:06 -0700)]
Fix build: disable OpenCORE by default.
Fixes http://b.android.com/2308
This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
The Android Open Source Project [Sun, 29 Mar 2009 15:55:26 +0000 (08:55 -0700)]
Merge branch 'open_source' into google_internal
Conflicts:
core/build_id.mk
Brett Chabot [Sat, 28 Mar 2009 02:50:26 +0000 (19:50 -0700)]
AI 143392: am: CL 143263 am: CL 143102 Add build environment shortcut to runtest.py.
This change does not affect device code.
Original author: brettchabot
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143392
The Android Open Source Project [Sat, 28 Mar 2009 01:48:30 +0000 (18:48 -0700)]
Merge commit 'goog/cupcake'
The Android Open Source Project [Fri, 27 Mar 2009 22:30:35 +0000 (15:30 -0700)]
Merge commit 'korg/cupcake'
Brett Chabot [Fri, 27 Mar 2009 17:25:11 +0000 (10:25 -0700)]
AI 143102: Add build environment shortcut to runtest.py.
This change does not affect device code.
BUG=
1741172
Automated import of CL 143102
Iliyan Malchev [Thu, 26 Mar 2009 01:09:52 +0000 (18:09 -0700)]
Automated import from //branches/master/...@142824,142824
Eric Fischer [Wed, 25 Mar 2009 23:12:29 +0000 (16:12 -0700)]
Automated import from //branches/master/...@142758,142758
Andy Stadler [Wed, 25 Mar 2009 22:50:11 +0000 (15:50 -0700)]
Automated import from //branches/master/...@142738,142738
Eric Fischer [Wed, 25 Mar 2009 22:21:11 +0000 (15:21 -0700)]
Automated import from //branches/cupcake/...@142639,142639
Andy Stadler [Wed, 25 Mar 2009 17:06:48 +0000 (10:06 -0700)]
Automated import from //branches/cupcake/...@142563,142563
Fredrik Markström [Tue, 24 Mar 2009 22:38:51 +0000 (23:38 +0100)]
Modify linux-arm.mk to support the armv4t architecture instead of armv4.
armv4 was only implemented on StrongArm and Arm8 (See http://en.wikipedia.org/wiki/ARM_architecture)
and will be more difficult to support since it does not support the bx instruction.
armv4t on the other hand is used in a wide range of cpu:s.
armv4 is also not supported by bionic or dalvik, but armv4t is.
Thumb-mode is not yet enabled since there are some unresolved abi-issues.
Sriram Raman [Wed, 25 Mar 2009 05:47:20 +0000 (22:47 -0700)]
Automated import from //branches/master/...@142411,142411
Dave Bort [Wed, 25 Mar 2009 03:52:27 +0000 (20:52 -0700)]
Automated import from //branches/master/...@141763,141763
Dima Zavin [Wed, 25 Mar 2009 03:31:59 +0000 (20:31 -0700)]
Automated import from //branches/master/...@141547,141547
Iliyan Malchev [Wed, 25 Mar 2009 02:58:46 +0000 (19:58 -0700)]
Automated import from //branches/master/...@141287,141287
Sriram Raman [Wed, 25 Mar 2009 02:39:09 +0000 (19:39 -0700)]
Automated import from //branches/cupcake/...@142409,142409
Dave Sparks [Wed, 25 Mar 2009 02:14:20 +0000 (19:14 -0700)]
Automated import from //branches/master/...@141017,141017
Joe Onorato [Wed, 25 Mar 2009 02:07:34 +0000 (19:07 -0700)]
Automated import from //branches/master/...@140984,140984
Dianne Hackborn [Wed, 25 Mar 2009 01:36:42 +0000 (18:36 -0700)]
Automated import from //branches/master/...@140824,140824
Sriram Raman [Wed, 25 Mar 2009 01:07:52 +0000 (18:07 -0700)]
Automated import from //branches/cupcake/...@141670,141670
Sriram Raman [Wed, 25 Mar 2009 01:07:02 +0000 (18:07 -0700)]
Automated import from //branches/cupcake/...@141669,141669
Dianne Hackborn [Wed, 25 Mar 2009 00:47:35 +0000 (17:47 -0700)]
Automated import from //branches/master/...@140493,140493
The Android Open Source Project [Fri, 20 Mar 2009 06:08:36 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
Edward Hervey [Thu, 19 Mar 2009 11:27:57 +0000 (12:27 +0100)]
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).
The Android Open Source Project [Thu, 19 Mar 2009 05:20:24 +0000 (22:20 -0700)]
auto import //branches/master/...@140412
The Android Open Source Project [Thu, 19 Mar 2009 03:53:43 +0000 (20:53 -0700)]
auto import //branches/donutburger/...@140359
The Android Open Source Project [Thu, 19 Mar 2009 00:39:42 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Wed, 18 Mar 2009 23:58:18 +0000 (16:58 -0700)]
Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Conflicts:
core/prelink-linux-arm.map
android-build SharedAccount [Sat, 14 Mar 2009 06:22:59 +0000 (23:22 -0700)]
add Launcher as home
The Android Open Source Project [Fri, 13 Mar 2009 20:04:19 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Wed, 11 Mar 2009 19:11:54 +0000 (12:11 -0700)]
auto import from //branches/cupcake/...@137873
Ravi K Yenduri [Tue, 10 Mar 2009 20:05:09 +0000 (15:05 -0500)]
Allow prebuilt libraries and the associated makefile to be in
different directories.
The Android Open Source Project [Mon, 9 Mar 2009 18:52:11 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Fri, 6 Mar 2009 04:00:41 +0000 (20:00 -0800)]
auto import from //depot/cupcake/@136745
The Android Open Source Project [Thu, 5 Mar 2009 22:34:30 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:28:42 +0000 (19:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:14 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:03:52 +0000 (14:03 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:15 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
Benno Leslie [Fri, 27 Feb 2009 10:04:08 +0000 (21:04 +1100)]
Updated the sgrep tool so that is will treat Makefiles (.mk)
and shell scripts (.sh) as 'source' files.
aurelien...@free.fr [Mon, 2 Mar 2009 18:54:28 +0000 (10:54 -0800)]
Add support for symbolic links for product folders
Fixes http://code.google.com/p/android/issues/detail?id=2116