OSDN Git Service
Android (Google) Code Review [Sat, 25 Jul 2009 17:11:58 +0000 (10:11 -0700)]
am
eaf299f8: Merge change 8339 into donut
Merge commit '
eaf299f8b465d7db2f37f068b33ace9a5d6d1589'
* commit '
eaf299f8b465d7db2f37f068b33ace9a5d6d1589':
AI 150083: Minor updates to the ndk docs based on approved messaging.
Android (Google) Code Review [Sat, 25 Jul 2009 17:11:56 +0000 (10:11 -0700)]
am
e85be87e: Merge change 3175 into donut
Merge commit '
e85be87ee6e17df30c1cdfee523e8e8f255ebf62'
* commit '
e85be87ee6e17df30c1cdfee523e8e8f255ebf62':
page load perfomance improvements...
Android (Google) Code Review [Sat, 25 Jul 2009 07:54:27 +0000 (00:54 -0700)]
Merge change 8494
* changes:
Fix issue
2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked.
Android (Google) Code Review [Sat, 25 Jul 2009 00:40:17 +0000 (17:40 -0700)]
Merge change 8339 into donut
* changes:
Merge commit '
e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc
Sriram Raman [Fri, 24 Jul 2009 23:09:20 +0000 (16:09 -0700)]
am
1e96ac84: Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed. Don\'t have to re-specify exclusion list for the patch file construction.
Merge commit '
1e96ac8430da922332e4c85e7eed0e95442ff2ce'
* commit '
1e96ac8430da922332e4c85e7eed0e95442ff2ce':
Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
Android (Google) Code Review [Fri, 24 Jul 2009 23:04:56 +0000 (16:04 -0700)]
Merge change 3175 into donut
* changes:
page load perfomance improvements... remove the lists.js file from the <head>, which slows down page load a lot (over 300K), and instead load it dynamically on page load. also remove navtree_data.js from the <head>, which also slows the load and is only used in the reference when in tree view. This file is now loaded during the initialization of the nav tree.
Sriram Raman [Fri, 24 Jul 2009 20:52:32 +0000 (13:52 -0700)]
Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
Don't have to re-specify exclusion list for the patch file construction.
Mike Lockwood [Fri, 24 Jul 2009 21:03:09 +0000 (17:03 -0400)]
cleanspec.mk: clean step for enabling GPS on passion
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android Git Automerger [Fri, 24 Jul 2009 19:48:15 +0000 (12:48 -0700)]
Android Git Automerger [Fri, 24 Jul 2009 19:48:01 +0000 (12:48 -0700)]
Android Git Automerger [Fri, 24 Jul 2009 19:47:48 +0000 (12:47 -0700)]
Android Git Automerger [Fri, 24 Jul 2009 19:47:28 +0000 (12:47 -0700)]
Android Git Automerger [Fri, 24 Jul 2009 19:47:17 +0000 (12:47 -0700)]
Android Git Automerger [Fri, 24 Jul 2009 19:47:03 +0000 (12:47 -0700)]
Android Git Automerger [Fri, 24 Jul 2009 19:46:51 +0000 (12:46 -0700)]
Android (Google) Code Review [Fri, 24 Jul 2009 19:35:21 +0000 (12:35 -0700)]
Merge change 8517 into donut
* changes:
Fix generic-userdebug build (don't build OTA for this target).
Sriram Raman [Fri, 24 Jul 2009 19:02:28 +0000 (12:02 -0700)]
Fix generic-userdebug build (don't build OTA for this target).
James Dong [Fri, 24 Jul 2009 03:32:37 +0000 (20:32 -0700)]
DO NOT MERGE TO MASTER
remove opencore avc encoder DSO
bug
2001900
Eric Laurent [Fri, 24 Jul 2009 13:56:02 +0000 (06:56 -0700)]
Fix issue
2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked.
Android (Google) Code Review [Fri, 24 Jul 2009 06:58:04 +0000 (23:58 -0700)]
am
4d7c4348: Merge change 8295 into donut
Merge commit '
4d7c4348077b0f1a713ebffe59b458a5d95fba11'
* commit '
4d7c4348077b0f1a713ebffe59b458a5d95fba11':
applypatch changes for patching recovery image
Doug Zongker [Fri, 24 Jul 2009 03:06:57 +0000 (20:06 -0700)]
don't try to build recovery patch in generic build
Doug Zongker [Fri, 24 Jul 2009 01:48:38 +0000 (18:48 -0700)]
make path explicit when running imgdiff
The build servers don't run "lunch" before building, so they don't
have the same path as everyone else. Explicitly set it when running
imgdiff.
Doug Zongker [Fri, 24 Jul 2009 01:27:43 +0000 (18:27 -0700)]
fix imgdiff/bsdiff dependencies
These should be regular dependencies, not order-only ones.
Doug Zongker [Fri, 24 Jul 2009 00:52:36 +0000 (17:52 -0700)]
fix system size calculation for SDK build
The SDK build doesn't have recovery, don't try to generate a patch or
include it in the system image size calculation. Also there's a
dependency on bsdiff that was omitted.
Android (Google) Code Review [Thu, 23 Jul 2009 23:25:46 +0000 (16:25 -0700)]
am
076f0bfb: Merge change 8313 into donut
Merge commit '
076f0bfbab74f725f2c643b8639efe2bb05a0f61'
* commit '
076f0bfbab74f725f2c643b8639efe2bb05a0f61':
Fixed PDK links that point to the Creative Commons License
Marco Nelissen [Thu, 23 Jul 2009 23:25:28 +0000 (16:25 -0700)]
am
33a76aa9: Clean step to remove silent ringtone.
Merge commit '
33a76aa9199583ff0a53900ba8ebe2b4c39d85ed'
* commit '
33a76aa9199583ff0a53900ba8ebe2b4c39d85ed':
Clean step to remove silent ringtone.
Android (Google) Code Review [Thu, 23 Jul 2009 22:24:45 +0000 (15:24 -0700)]
Merge change 8404
* changes:
add librs and librs_jni to the prelink map.
Jason Sams [Thu, 23 Jul 2009 22:15:13 +0000 (15:15 -0700)]
add librs and librs_jni to the prelink map.
Doug Zongker [Thu, 23 Jul 2009 22:12:53 +0000 (15:12 -0700)]
use a binary patch to install recovery from system
Instead of storing the whole recovery image in system in order to
flash it on first boot, we instead use an imgdiff patch from the boot
image to create the recovery image. This is substantially smaller
since it effectively only stores the recovery binary and UI images
(the kernel and the init binary are identical to that of the boot
image).
This change modifies the OTA-building script to create and install
these patches, and changes the calculation of the system image size in
the Makefile to reflect the new scheme.
Jack Palevich [Thu, 23 Jul 2009 20:23:09 +0000 (13:23 -0700)]
Merge commit '
2613966d' into manualmerge
Conflicts:
cleanspec.mk
Android (Google) Code Review [Thu, 23 Jul 2009 19:38:03 +0000 (12:38 -0700)]
Merge change 8295 into donut
* changes:
applypatch changes for patching recovery image
Jesse Wilson [Thu, 23 Jul 2009 18:10:14 +0000 (11:10 -0700)]
Merge commit '
289d80ee' into manualmerge2
Conflicts:
tools/droiddoc/src/DroidDoc.java
tools/droiddoc/test/stubs/func.sh
Android (Google) Code Review [Thu, 23 Jul 2009 17:45:57 +0000 (10:45 -0700)]
Merge change 8313 into donut
* changes:
Fixed PDK links that point to the Creative Commons License
Marco Nelissen [Thu, 23 Jul 2009 16:23:44 +0000 (09:23 -0700)]
Clean step to remove silent ringtone.
Gaurav Mathur [Thu, 23 Jul 2009 03:27:12 +0000 (20:27 -0700)]
Fixed PDK links that point to the Creative Commons License
Doug Zongker [Thu, 23 Jul 2009 01:27:31 +0000 (18:27 -0700)]
applypatch changes for patching recovery image
Make some changes needed to applypatch in order to store the recovery
image in the system partition as a binary patch relative to the boot
image:
- make applypatch use shared libraries, so it's smaller. It will
need to be on the main system so it can install the recovery
image. Make an applypatch_static binary for use in recovery
packages (still needed for updating cupcake devices to donut).
- output the results of patching to an in-memory buffer and write
that to the partition; there's no convenient /tmp for us to us.
(This should be basically a no-op in recovery, since /tmp is a
ramdisk anyway.)
Dirk Dougherty [Thu, 23 Jul 2009 02:01:20 +0000 (19:01 -0700)]
Merge commit '
e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc
Jack Palevich [Wed, 22 Jul 2009 23:04:39 +0000 (16:04 -0700)]
Clean up after removing android.opengl.Version
Doug Zongker [Wed, 22 Jul 2009 16:28:25 +0000 (09:28 -0700)]
make bootloader requirements optional
Interpret a "*" in the "require version-bootloader" line as "don't
require any specific bootloader". Sholes OTAs include the bootloader
and the main system in the same package.
Feng Qian [Wed, 22 Jul 2009 05:24:02 +0000 (22:24 -0700)]
Force rebuild libwebcore.
This should be submitted after 8156.
Jesse Wilson [Tue, 21 Jul 2009 21:02:14 +0000 (14:02 -0700)]
Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.
The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.
The clearsilver templates will be changed to be pretty in a follow up change.
Conflicts:
tools/droiddoc/src/DroidDoc.java
Android (Google) Code Review [Tue, 21 Jul 2009 21:38:39 +0000 (14:38 -0700)]
am
70a76816: Merge change 7944 into donut
Merge commit '
70a76816e5268e345a2a52d12c7c0140e9645015'
* commit '
70a76816e5268e345a2a52d12c7c0140e9645015':
better patching for zip files
Android (Google) Code Review [Tue, 21 Jul 2009 19:07:35 +0000 (12:07 -0700)]
Merge change 7944 into donut
* changes:
better patching for zip files
Jesse Wilson [Tue, 2 Jun 2009 00:59:44 +0000 (17:59 -0700)]
Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.
The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.
The clearsilver templates will be changed to be pretty in a follow up change.
Erik Gilling [Mon, 20 Jul 2009 22:48:03 +0000 (15:48 -0700)]
Force sholes to rebuild in order to pick up linker fix
A work around is implmented in the new linker to avoid instruction streams
which are known to cause problems on cortex a8. In order to work reliably
with branch prediction enabled, the entire runtime needs to be built with
this toolchain.
Signed-off-by: Erik Gilling <konkers@android.com>
Doug Zongker [Mon, 20 Jul 2009 21:45:29 +0000 (14:45 -0700)]
better patching for zip files
Adds a zip mode ("-z") to imgdiff to construct efficient patches for
zip files (including jars and apks). We identify the regions within
the zip file containing deflated data, and when a corresponding file
can be found in the source zip, a patch is generated for the
uncompressed version of the data.
The GZIP chunk type is replaced with a DEFLATE chunk type that handles
a raw deflated data stream. This new DEFLATE chunk can be used for
both gzipped pieces (as found within boot and recovery images) and zip
files (apks, etc.) The gzip header and footer are handled by NORMAL
chunks on either side of the main DEFLATE chunks. (Typically these
tiny NORMAL chunks will get merged with adjacent chunks, so the number
of output chunks is unaffected.)
Add a test script that tests the generate-apply cycle on all the zips
and images within a pair of full OTA packages.
Romain Guy [Mon, 20 Jul 2009 20:41:31 +0000 (13:41 -0700)]
am
476f46bb: Add GestureBuilder to SDK build.
Merge commit '
476f46bb568ebe5879e46d0d975ea885409f586a'
* commit '
476f46bb568ebe5879e46d0d975ea885409f586a':
Add GestureBuilder to SDK build.
Romain Guy [Mon, 20 Jul 2009 18:22:08 +0000 (11:22 -0700)]
Add GestureBuilder to SDK build.
Joe Onorato [Mon, 20 Jul 2009 15:57:59 +0000 (11:57 -0400)]
Add a separate version of the docs build that only does the stubs.
That way we don't have to wait for clearsilver to write the thousands
of html files during every build.
(This is the build change, there is also a frameworks/base change)
Android (Google) Code Review [Mon, 20 Jul 2009 03:20:12 +0000 (20:20 -0700)]
am
6ef19dad: Merge change 7040 into donut
Merge commit '
6ef19dadbf1f2e35551d2bf559b0d533f77b366d'
* commit '
6ef19dadbf1f2e35551d2bf559b0d533f77b366d':
CTS: Add media test cases to CTS makefile
Android (Google) Code Review [Sat, 18 Jul 2009 00:18:21 +0000 (17:18 -0700)]
Merge change 7774
* changes:
enable cortex branch predition errata workaround for armv7-a builds
Joe Onorato [Sat, 18 Jul 2009 00:13:08 +0000 (17:13 -0700)]
Erik Gilling [Fri, 17 Jul 2009 22:57:10 +0000 (15:57 -0700)]
enable cortex branch predition errata workaround for armv7-a builds
Signed-off-by: Erik Gilling <konkers@android.com>
Android (Google) Code Review [Fri, 17 Jul 2009 22:56:25 +0000 (15:56 -0700)]
Merge change 7040 into donut
* changes:
CTS: Add media test cases to CTS makefile
Joe Onorato [Fri, 17 Jul 2009 19:33:40 +0000 (15:33 -0400)]
Speed up the full build.
Now, by default, instead of fully building everything,
we skip dexing the modules that aren't going to be included
in the current build.
This will slow down some of the incremental builds (like tests),
but it improves the regular eng build from 27.5 minutes on my
Mac Pro to 25 minutes. That's not as much of an improvement
as I had hoped for, but it's still better.
There is also a change in here that puts the java-source-list
file which is used to get around limited command line lengths
in the proper directory. Before this change, it was an
accident that the directory for that file existed!
Android (Google) Code Review [Fri, 17 Jul 2009 00:54:18 +0000 (17:54 -0700)]
am
ccf9c1da: Merge change 7479 into donut
Merge commit '
ccf9c1da8612d2d9bfb13efb97ceed29c15c83b4'
* commit '
ccf9c1da8612d2d9bfb13efb97ceed29c15c83b4':
handle identical gzip chunks better
Android (Google) Code Review [Thu, 16 Jul 2009 22:17:45 +0000 (15:17 -0700)]
Merge change 7583
* changes:
Modify libqcamera to be called liboemcamera
Rebecca Schultz Zavin [Wed, 15 Jul 2009 23:49:00 +0000 (16:49 -0700)]
Modify libqcamera to be called liboemcamera
This will allow us to support non qualcomm cameras in the prelink map.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Android (Google) Code Review [Thu, 16 Jul 2009 20:30:16 +0000 (13:30 -0700)]
Merge change 7479 into donut
* changes:
handle identical gzip chunks better
Android (Google) Code Review [Thu, 16 Jul 2009 20:25:02 +0000 (13:25 -0700)]
Merge change 7524
* changes:
add HAVE_VFP flag
Mike Reed [Thu, 16 Jul 2009 16:20:50 +0000 (12:20 -0400)]
add HAVE_VFP flag
Android (Google) Code Review [Thu, 16 Jul 2009 17:08:48 +0000 (10:08 -0700)]
Merge change 7519
* changes:
cleanstep for removing the asf config file
Marco Nelissen [Thu, 16 Jul 2009 15:27:40 +0000 (08:27 -0700)]
cleanstep for removing the asf config file
Doug Zongker [Thu, 16 Jul 2009 01:15:19 +0000 (18:15 -0700)]
am
a237874c: fix the modtime of files in the apk when signing
Merge commit '
a237874ccf49e92b93faea51f65c2ff37ea19ac7'
* commit '
a237874ccf49e92b93faea51f65c2ff37ea19ac7':
fix the modtime of files in the apk when signing
Doug Zongker [Thu, 16 Jul 2009 00:54:30 +0000 (17:54 -0700)]
handle identical gzip chunks better
Improve the speed of incremental OTA install by treating unchanging
gzip chunks as normal chunks, avoiding a decompress/recompress cycle.
This reduces the time needed to apply a patch to a boot image where
the kernel has not changed from ~30 seconds to ~2 seconds, on an opal.
Doug Zongker [Wed, 15 Jul 2009 22:43:39 +0000 (15:43 -0700)]
fix the modtime of files in the apk when signing
SignApk fixes the timestamp of the signature files it adds. Use that
same timestamp for all the files, so that the modtime doesn't vary
from build to build. (Incremental OTAs currently spend significant
time rewriting every .apk to do nothing but patch in timestamp
changes.)
Robert Greenwalt [Wed, 15 Jul 2009 22:07:44 +0000 (15:07 -0700)]
Fix LOCAL_PATH in mm builds so that overlays work
LOCAL_PATH is a relative path from TOP when making a full build.
This change makes that true for mm builds too.
Phil Dubach [Mon, 13 Jul 2009 21:47:25 +0000 (14:47 -0700)]
CTS: Add media test cases to CTS makefile
Doug Zongker [Tue, 14 Jul 2009 19:54:56 +0000 (12:54 -0700)]
am
03061474: in auto mode, generate both edify and amend scripts for full OTAs
Merge commit '
030614740c1a22e51c6513058852f9ab368fdf5d'
* commit '
030614740c1a22e51c6513058852f9ab368fdf5d':
in auto mode, generate both edify and amend scripts for full OTAs
Android (Google) Code Review [Tue, 14 Jul 2009 19:51:28 +0000 (12:51 -0700)]
Merge change 7093
* changes:
Python script to parse a build log and present the warnings in html
Doug Zongker [Tue, 14 Jul 2009 01:36:37 +0000 (18:36 -0700)]
in auto mode, generate both edify and amend scripts for full OTAs
Generate packages that can be installed by either amend or edify, so
we can remove amend support from donut.
Marco Nelissen [Tue, 14 Jul 2009 16:04:04 +0000 (09:04 -0700)]
Python script to parse a build log and present the warnings in html
Android (Google) Code Review [Tue, 14 Jul 2009 17:50:13 +0000 (10:50 -0700)]
Merge change 6928
* changes:
set -fpu=neon so we can use arm_neon.h
Android (Google) Code Review [Tue, 14 Jul 2009 04:00:57 +0000 (21:00 -0700)]
Merge change 7059
* changes:
Apparently the build server uses a different compiler, one that doesn't understand '-fdiagnostics-show-option'
Marco Nelissen [Tue, 14 Jul 2009 03:42:49 +0000 (20:42 -0700)]
Apparently the build server uses a different compiler, one that doesn't understand '-fdiagnostics-show-option'
Android (Google) Code Review [Tue, 14 Jul 2009 03:30:10 +0000 (20:30 -0700)]
Merge change 7036
* changes:
Enable some more useful warnings, and treat some particularly bad ones (that we don't have currently) as errors.
Marco Nelissen [Tue, 14 Jul 2009 00:51:59 +0000 (17:51 -0700)]
Enable some more useful warnings, and treat some particularly bad ones (that we don't have currently) as errors.
Mike Lockwood [Mon, 13 Jul 2009 23:26:34 +0000 (19:26 -0400)]
cleanspec.mk: Add clean step needed for switching sholes to real GPS.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Wei Huang [Thu, 9 Jul 2009 00:24:59 +0000 (17:24 -0700)]
add clean step for IDataMessagingService.
Mike Reed [Mon, 13 Jul 2009 18:48:43 +0000 (14:48 -0400)]
set -fpu=neon so we can use arm_neon.h
Android (Google) Code Review [Fri, 10 Jul 2009 23:23:23 +0000 (16:23 -0700)]
Merge change 6571
* changes:
Since we're using gcc 4.4 in master, we can use the -Werror= option to make not having a virtual destructor in classes with virtual methods an error. I already fixed all code that had this problem, so now it's a matter of turning the option on. Also, as long as we don't have any C-specific options, it's probably best to copy the CPP flags from the C flags. We can always break them out later.
Mike Reed [Fri, 10 Jul 2009 19:29:45 +0000 (15:29 -0400)]
rename libsgl/libscorecg to libskia
Marco Nelissen [Thu, 9 Jul 2009 00:51:18 +0000 (17:51 -0700)]
Since we're using gcc 4.4 in master, we can use the -Werror= option
to make not having a virtual destructor in classes with virtual
methods an error. I already fixed all code that had this problem,
so now it's a matter of turning the option on.
Also, as long as we don't have any C-specific options, it's
probably best to copy the CPP flags from the C flags. We can
always break them out later.
Android (Google) Code Review [Wed, 8 Jul 2009 22:35:05 +0000 (15:35 -0700)]
Merge change 6444
* changes:
Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
Android (Google) Code Review [Wed, 8 Jul 2009 20:52:21 +0000 (13:52 -0700)]
am
e41accf6: Merge change 6412 into donut
Merge commit '
e41accf68eedfd17bc569aee8480cf8c48d82e61'
* commit '
e41accf68eedfd17bc569aee8480cf8c48d82e61':
Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
Doug Zongker [Wed, 8 Jul 2009 20:52:20 +0000 (13:52 -0700)]
am
742fa575: fix problems with new image size calculations
Merge commit '
742fa575d09272f1e06616fc208a1e08830c8f82'
* commit '
742fa575d09272f1e06616fc208a1e08830c8f82':
fix problems with new image size calculations
Android (Google) Code Review [Wed, 8 Jul 2009 20:01:22 +0000 (13:01 -0700)]
Merge change 6412 into donut
* changes:
Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
Doug Zongker [Wed, 8 Jul 2009 19:09:04 +0000 (12:09 -0700)]
fix problems with new image size calculations
The build servers have GNU coreutils 5.93, where stat does not output
a newline. Ubuntu hardy has GNU coreutils 6.10, where it does.
Lacking a newline messes up the summing of the sizes. Fix
get-file-size to remove the newline if present, and make the total
calculation in assert-max-file-size more robust.
Also, if the image was too big, it was not actually making the build
fail (because /bin/false was not the last thing called). Fix that so
it does.
Ramanan Rajeswaran [Wed, 8 Jul 2009 15:28:14 +0000 (08:28 -0700)]
Add calculator and email to generic
San Mehat [Wed, 8 Jul 2009 03:13:41 +0000 (20:13 -0700)]
Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
This reverts commit
ff2c9deb7966f79572d502a7048a3e6f0f9939b8.
This breaks SD cards on the device (always installs the emulator vold.conf)
Doug Zongker [Wed, 8 Jul 2009 00:19:29 +0000 (17:19 -0700)]
am
8cebf1ff: fix mislaid \'if\' in recovery
Merge commit '
8cebf1ff7836a5dc365e49f7a14d7546a651d9c7'
* commit '
8cebf1ff7836a5dc365e49f7a14d7546a651d9c7':
fix mislaid 'if' in recovery
Doug Zongker [Wed, 8 Jul 2009 00:14:25 +0000 (17:14 -0700)]
fix mislaid 'if' in recovery
When I moved the building of the recovery image upwards in the file, I
moved an 'endif' surrounding it but not the matching 'if'. How did
this ever work?
Doug Zongker [Tue, 7 Jul 2009 23:43:16 +0000 (16:43 -0700)]
Marco Nelissen [Tue, 7 Jul 2009 20:59:38 +0000 (13:59 -0700)]
Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
Ramanan Rajeswaran [Tue, 7 Jul 2009 16:41:23 +0000 (09:41 -0700)]
Add calculator to core makefiles
Jean-Baptiste Queru [Mon, 6 Jul 2009 19:27:36 +0000 (12:27 -0700)]
Merge branch 'master' of git://android.git./platform/build into merge_korg_master
Conflicts:
core/apicheck_msg_current.txt
Android (Google) Code Review [Fri, 3 Jul 2009 15:58:53 +0000 (08:58 -0700)]
am
bd1ee348: Merge change 6059 into donut
Merge commit '
bd1ee348a1891836cf3b5d0da72e75c0d256fa43'
* commit '
bd1ee348a1891836cf3b5d0da72e75c0d256fa43':
Also look in vendor/*/build for vendorsetup.sh
Android (Google) Code Review [Fri, 3 Jul 2009 15:58:35 +0000 (08:58 -0700)]
am
92c8ecbf: Merge change 5929 into donut
Merge commit '
92c8ecbf99daf492a24408686017609763429251'
* commit '
92c8ecbf99daf492a24408686017609763429251':
Add the JNI library of CertTool for handling certificates.
Android (Google) Code Review [Fri, 3 Jul 2009 07:15:12 +0000 (00:15 -0700)]
Merge change 6050
* changes:
force libwebcore clean build after turning <video> support with V8
Andrei Popescu [Fri, 3 Jul 2009 00:10:41 +0000 (01:10 +0100)]
force libwebcore clean build after turning <video> support with V8
OSDN Git Service
