OSDN Git Service
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:09 +0000 (17:12 -0700)]
Merge donut into master
Dirk Dougherty [Wed, 22 Apr 2009 20:20:39 +0000 (13:20 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 22 Apr 2009 20:19:29 +0000 (13:19 -0700)]
AI 147303: am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147303
Dirk Dougherty [Wed, 22 Apr 2009 07:47:52 +0000 (00:47 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Wed, 22 Apr 2009 07:46:34 +0000 (00:46 -0700)]
AI 147305: am: CL 147303 am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
"highlights".
Also, note that the installing and upgrading docs are being updated in
a different CL, so the new version is not displayed on my staging server.
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147305
Doug Zongker [Wed, 22 Apr 2009 00:12:54 +0000 (17:12 -0700)]
add -w option to ota_from_target_files
Add option to make OTA packages that wipe user data.
Android (Google) Code Review [Tue, 21 Apr 2009 23:06:17 +0000 (16:06 -0700)]
Merge change 362 into donut
* changes:
generalize -t option to add and remove tags in fingerprints
Doug Zongker [Tue, 21 Apr 2009 17:04:51 +0000 (10:04 -0700)]
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.
Xavier Ducrohet [Tue, 21 Apr 2009 20:39:33 +0000 (13:39 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Tue, 21 Apr 2009 20:38:15 +0000 (13:38 -0700)]
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
Xavier Ducrohet [Tue, 21 Apr 2009 20:36:38 +0000 (13:36 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Tue, 21 Apr 2009 20:35:21 +0000 (13:35 -0700)]
AI 147198: am: CL 147197 Adds calculator to sdk build.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 147198
Dirk Dougherty [Tue, 21 Apr 2009 08:01:23 +0000 (01:01 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 08:00:11 +0000 (01:00 -0700)]
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
Dirk Dougherty [Tue, 21 Apr 2009 00:58:00 +0000 (17:58 -0700)]
Merge branch 'readonly-p4-master'
Dirk Dougherty [Tue, 21 Apr 2009 00:56:31 +0000 (17:56 -0700)]
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
Android (Google) Code Review [Mon, 20 Apr 2009 19:11:35 +0000 (12:11 -0700)]
Merge change 268 into donut
* changes:
add option to modify build fingerprint tags when signing
Scott Main [Mon, 20 Apr 2009 18:19:35 +0000 (11:19 -0700)]
Merge branch 'readonly-p4-master'
Scott Main [Mon, 20 Apr 2009 18:18:15 +0000 (11:18 -0700)]
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
Scott Main [Mon, 20 Apr 2009 18:17:51 +0000 (11:17 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Mon, 20 Apr 2009 18:16:42 +0000 (11:16 -0700)]
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
Urs Grob [Sun, 19 Apr 2009 05:45:40 +0000 (22:45 -0700)]
Merge branch 'readonly-p4-master'
Urs Grob [Sun, 19 Apr 2009 05:44:31 +0000 (22:44 -0700)]
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
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
Urs Grob [Fri, 17 Apr 2009 18:28:20 +0000 (11:28 -0700)]
Merge branch 'readonly-p4-donut' into donut
Urs Grob [Fri, 17 Apr 2009 18:27:08 +0000 (11:27 -0700)]
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
Joe Onorato [Fri, 17 Apr 2009 18:16:46 +0000 (11:16 -0700)]
Merge branch 'readonly-p4-donut' into donut
Joe Onorato [Fri, 17 Apr 2009 18:15:32 +0000 (11:15 -0700)]
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
Doug Zongker [Fri, 17 Apr 2009 17:15:58 +0000 (10:15 -0700)]
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.
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
Doug Zongker [Thu, 16 Apr 2009 17:16:38 +0000 (10:16 -0700)]
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).
Dirk Dougherty [Wed, 15 Apr 2009 18:41:27 +0000 (11:41 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 15 Apr 2009 18:40:10 +0000 (11:40 -0700)]
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
Dirk Dougherty [Wed, 15 Apr 2009 18:37:52 +0000 (11:37 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 15 Apr 2009 18:36:34 +0000 (11:36 -0700)]
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
Doug Zongker [Tue, 14 Apr 2009 21:05:15 +0000 (14:05 -0700)]
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.
Doug Zongker [Tue, 14 Apr 2009 19:35:46 +0000 (12:35 -0700)]
Merge branch 'readonly-p4-donut' into donut
Doug Zongker [Tue, 14 Apr 2009 19:34:27 +0000 (12:34 -0700)]
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
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.
Raphael Moll [Tue, 14 Apr 2009 01:22:26 +0000 (18:22 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 14 Apr 2009 01:21:16 +0000 (18:21 -0700)]
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
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.
Joe Onorato [Mon, 13 Apr 2009 15:32:27 +0000 (08:32 -0700)]
Merge branch 'readonly-p4-donut' into donut
Joe Onorato [Mon, 13 Apr 2009 15:31:16 +0000 (08:31 -0700)]
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
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
Jack Veenstra [Fri, 10 Apr 2009 17:32:11 +0000 (10:32 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jack Veenstra [Fri, 10 Apr 2009 17:30:51 +0000 (10:30 -0700)]
AI 145709: Fixed tracedmdump() by correcting the KERNEL path.
Merged 145592 from master.
BUG=
1630077
Automated import of CL 145709
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:36:10 +0000 (06:36 -0700)]
Merge branch 'readonly-p4-donut' into donut
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
Mike Lockwood [Fri, 10 Apr 2009 13:34:59 +0000 (06:34 -0700)]
AI 145704: Manually integrate change 145576 to donutburger to fix "lunch"
Automated import of CL 145704
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
Xavier Ducrohet [Fri, 10 Apr 2009 02:43:23 +0000 (19:43 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Fri, 10 Apr 2009 02:42:09 +0000 (19:42 -0700)]
AI 145622: am: CL 145380 Fixes for add-on build
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 145622
Joe Onorato [Fri, 10 Apr 2009 02:40:30 +0000 (19:40 -0700)]
Merge branch 'readonly-p4-donut' into donut
Joe Onorato [Fri, 10 Apr 2009 02:39:15 +0000 (19:39 -0700)]
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
Joe Onorato [Fri, 10 Apr 2009 02:32:25 +0000 (19:32 -0700)]
Merge branch 'readonly-p4-donut' into donut
Joe Onorato [Fri, 10 Apr 2009 02:31:12 +0000 (19:31 -0700)]
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
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:08:25 +0000 (14:08 -0700)]
Merge branch 'readonly-p4-donut' into donut
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:07:07 +0000 (14:07 -0700)]
AI 145464: am: CL 145080 Add Latin and Chinese method to SDK.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 145464
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
Xavier Ducrohet [Tue, 7 Apr 2009 03:31:11 +0000 (20:31 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Tue, 7 Apr 2009 03:30:02 +0000 (20:30 -0700)]
AI 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/...
Automated import of CL 144765
Doug Zongker [Mon, 6 Apr 2009 22:21:45 +0000 (15:21 -0700)]
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.
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'