OSDN Git Service
Jason Sams [Thu, 23 Jul 2009 22:15:13 +0000 (15:15 -0700)]
add librs and librs_jni to the prelink map.
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
Doug Zongker [Thu, 2 Jul 2009 22:24:24 +0000 (15:24 -0700)]
am
6e9c1a6d: remove some accidentally-submitted debug logging
Merge commit '
6e9c1a6dd0042e123941e59ad5da6fc569093fbb'
* commit '
6e9c1a6dd0042e123941e59ad5da6fc569093fbb':
remove some accidentally-submitted debug logging
Doug Zongker [Thu, 2 Jul 2009 16:00:54 +0000 (09:00 -0700)]
fix image size tests
There are currently two errors in the way we test the size of built
images against the size of the partition on the hardware:
- the limits in BoardConfig.mk are set with the data size only, but
images contain an extra 64 bytes per 2048-byte page. This means we
think the partition is about 1/32 smaller than it really is.
- when we deliver a build via OTA, the system partition ends up with
one more file than when it's flashed via fastboot. That file is a
copy of the recovery image. In order to be able to OTA a build, we
need to make sure the system partition has enough room for all the
system files plus the recovery image as well.
For the kila system partition, these errors are roughly the same order
of magnitude -- about 2MB, one in the "safe" direction, one in the
"unsafe" direction. This change fixes both to give us a more accurate
notion of how close we are to the limit.
Make the build emit a warning (but not fail) when the size is within
32kb of the limit.
Also, include the values of the partition size limits in an info file
in the target-files package, so post-processing tools can use them
without parsing the BoardConfig.mk file.
Android (Google) Code Review [Thu, 2 Jul 2009 12:43:46 +0000 (05:43 -0700)]
Merge change 6059 into donut
* changes:
Also look in vendor/*/build for vendorsetup.sh
Joe Onorato [Thu, 2 Jul 2009 12:41:48 +0000 (08:41 -0400)]
Also look in vendor/*/build for vendorsetup.sh
Android (Google) Code Review [Thu, 2 Jul 2009 07:28:16 +0000 (00:28 -0700)]
Merge change 5929 into donut
* changes:
Add the JNI library of CertTool for handling certificates.
Android (Google) Code Review [Thu, 2 Jul 2009 05:43:50 +0000 (22:43 -0700)]
am
a2bd9af9: Merge change 4759 into donut
Merge commit '
a2bd9af94757e73a4ff4c1fe8c98b4174b008b62'
* commit '
a2bd9af94757e73a4ff4c1fe8c98b4174b008b62':
Removing top tabs from PDK navigation because right now we only have one section.
Doug Zongker [Wed, 1 Jul 2009 23:01:52 +0000 (16:01 -0700)]
am
0f3298a4: delete source files not in target
Merge commit '
0f3298a497e32f6c2325a0071124a62d031fae6f'
* commit '
0f3298a497e32f6c2325a0071124a62d031fae6f':
delete source files not in target
Doug Zongker [Wed, 1 Jul 2009 21:18:59 +0000 (14:18 -0700)]
remove some accidentally-submitted debug logging
Chung-yih Wang [Wed, 1 Jul 2009 16:36:44 +0000 (00:36 +0800)]
Add the JNI library of CertTool for handling certificates.
Android (Google) Code Review [Tue, 30 Jun 2009 21:48:52 +0000 (14:48 -0700)]
am
c898974b: Merge change 5553 into donut
Merge commit '
c898974bcc3e6adfc2900c2a01bde5f83a0591d6'
* commit '
c898974bcc3e6adfc2900c2a01bde5f83a0591d6':
Change cts makefile to bundle junit.jar.
Android (Google) Code Review [Tue, 30 Jun 2009 20:53:47 +0000 (13:53 -0700)]
Merge change 4759 into donut
* changes:
Removing top tabs from PDK navigation because right now we only have one section.
Doug Zongker [Tue, 30 Jun 2009 15:16:58 +0000 (08:16 -0700)]
delete source files not in target
Incremental OTAs were not removing files from the old build that don't
exist in the new build. Fix.
Android (Google) Code Review [Mon, 29 Jun 2009 16:16:49 +0000 (09:16 -0700)]
Merge change 5553 into donut
* changes:
Change cts makefile to bundle junit.jar.
Brett Chabot [Fri, 26 Jun 2009 21:41:30 +0000 (14:41 -0700)]
Change cts makefile to bundle junit.jar.
Patrick Scott [Thu, 25 Jun 2009 14:38:26 +0000 (10:38 -0400)]
Fix the simulator build by setting TARGET_PRELINK_MODULE before including
BoardConfig.mk
Doug Zongker [Wed, 24 Jun 2009 21:34:57 +0000 (14:34 -0700)]
ignore missing/bad device-specific releasetools modules
If we fail to load the device-specific releasetools module (ie, if -s
is specified but the file is missing), issue an error message but
continue without any device-specific code.
Doug Zongker [Wed, 24 Jun 2009 20:58:30 +0000 (13:58 -0700)]
resolved conflicts for merge of
e1c31bac to master
Android (Google) Code Review [Wed, 24 Jun 2009 20:28:46 +0000 (13:28 -0700)]
Merge change 5099
* changes:
Move the BoardConfig.mk search and inclusion to core/config.mk.
Android (Google) Code Review [Wed, 24 Jun 2009 20:20:12 +0000 (13:20 -0700)]
Merge change 5082
* changes:
pass correct -s and -m options to release tools
Doug Zongker [Wed, 24 Jun 2009 00:40:35 +0000 (17:40 -0700)]
make building recovery and boot images optional
If the source target-files zip omits files needed to build the
recovery and/or boot images, leave them out instead of dying with an
error. This lets build like "generic-userdebug" work.
Android (Google) Code Review [Tue, 23 Jun 2009 23:34:08 +0000 (16:34 -0700)]
am
55766e47: Merge change 5150 into donut
Merge commit '
55766e47aaf4fe72a2b5cdd8aa60d14781c01e94'
* commit '
55766e47aaf4fe72a2b5cdd8aa60d14781c01e94':
don't fail if no required bootloaders are defined
Android (Google) Code Review [Tue, 23 Jun 2009 23:32:18 +0000 (16:32 -0700)]
Merge change 5150 into donut
* changes:
don't fail if no required bootloaders are defined
Doug Zongker [Tue, 23 Jun 2009 23:27:38 +0000 (16:27 -0700)]
don't fail if no required bootloaders are defined
Generic targets don't have a list of defined bootloaders. Instead of
failing to build an OTA package, just omit the constraint.
Fix bad references to ExternalError.
Android (Google) Code Review [Tue, 23 Jun 2009 23:20:02 +0000 (16:20 -0700)]
Merge change 4992
* changes:
Change to add the 4.4.0 toolchain directory to PATH.
Patrick Scott [Tue, 23 Jun 2009 19:25:06 +0000 (15:25 -0400)]
Move the BoardConfig.mk search and inclusion to core/config.mk.
This allows TARGET_ARCH_VARIANT to be set by the vendor before we choose the
architecture in core/combo/select.mk.
Also add a primitive armv7-a.mk for turning on hardware floating point.
Doug Zongker [Tue, 23 Jun 2009 16:46:33 +0000 (09:46 -0700)]
pass correct -s and -m options to release tools
When building an OTA package, TARGET_RELEASETOOLS_EXTENSIONS can be
set (in BoardConfig.mk) to specify where the device-specific
releasetools code is located. (The default location is the common
directory for the device's vendor.) The TARGET_OTA_SCRIPT_MODE can be
used to override the default script mode ("auto") for a particular
device.
Android (Google) Code Review [Tue, 23 Jun 2009 05:04:16 +0000 (22:04 -0700)]
am
bf8a59aa: Merge change 5017 into donut
Merge commit '
bf8a59aa12dd8dd8ceb6eeeec22dd94b8332c228'
* commit '
bf8a59aa12dd8dd8ceb6eeeec22dd94b8332c228':
Don't install afar and dexpreopt-wrapper on system while building tests.
Joe Onorato [Tue, 23 Jun 2009 05:04:15 +0000 (22:04 -0700)]
am
9d9f3678: Java 1.5 is required. Enforce it.
Merge commit '
9d9f367895655411c42123177ae1c32f104b3c01'
* commit '
9d9f367895655411c42123177ae1c32f104b3c01':
Java 1.5 is required. Enforce it.
Android (Google) Code Review [Tue, 23 Jun 2009 01:24:30 +0000 (18:24 -0700)]
Merge change 5017 into donut
* changes:
Don't install afar and dexpreopt-wrapper on system while building tests.
Joe Onorato [Tue, 23 Jun 2009 01:15:38 +0000 (18:15 -0700)]
Java 1.5 is required. Enforce it.
Doug Zongker [Sat, 20 Jun 2009 00:12:18 +0000 (17:12 -0700)]
generalize the definition of a "radio image"
Non-HTC devices may have multiple files constituting their "radio
image". Generalize the INSTALLED_RADIOIMAGE_TARGET variable a bit:
initially define it as empty, then let AndroidBoard.mk files add to
it. Provide a convenience function add-radio-image for them to call
to add files. Put all those files into the target_files zip for use
in OTA and fastboot package construction.
Note that for HTC devices, this changes the name of the radio image in
the target_files zip: instead of "RADIO/image" it will be
"RADIO/radio.img". Tools that use the target_files zip will need to
be changed.
Sriram Raman [Tue, 23 Jun 2009 00:16:37 +0000 (17:16 -0700)]
Don't install afar and dexpreopt-wrapper on system while building tests.
Jing Yu [Mon, 22 Jun 2009 23:03:34 +0000 (16:03 -0700)]
Change to add the 4.4.0 toolchain directory to PATH.
Since we have switched the default toolchain from 4.2.1 to 4.4.0,
we need to change the paths to add from 4.2.1 to 4.4.0.
Doug Zongker [Mon, 22 Jun 2009 18:32:31 +0000 (11:32 -0700)]
support hooks for device-specific code in OTA package generation
Replace the installation of the "radio image", which is an
HTC-specific notion, with calls to device-specific python modules that
can add whatever additional OTA script commands are necessary. Add
the -s flag to specify the location of the device-specific script
(replacing the unused -s flag in sign_target_files_apks).
Andrei Popescu [Fri, 19 Jun 2009 20:13:32 +0000 (21:13 +0100)]
force clean build of libwebcore after turning video on
David Warren [Fri, 19 Jun 2009 17:14:37 +0000 (10:14 -0700)]
Removing top tabs from PDK navigation because right now we only have one section.
Feng Qian [Fri, 19 Jun 2009 01:40:31 +0000 (18:40 -0700)]
Add clean-libwebcore to clean spec.
Android (Google) Code Review [Thu, 18 Jun 2009 20:58:02 +0000 (13:58 -0700)]
am
edb6829f: Merge change 4654 into donut
Merge commit '
edb6829f832bb79ba2e96ada74b3b971b73ad9a7'
* commit '
edb6829f832bb79ba2e96ada74b3b971b73ad9a7':
Put the java source file list files somewhere where they don't
Android (Google) Code Review [Thu, 18 Jun 2009 20:52:57 +0000 (13:52 -0700)]
Merge change 4654 into donut
* changes:
Put the java source file list files somewhere where they don't conflict with the .class files that are getting zipped up, and delete them when we're done with them.
Doug Zongker [Thu, 18 Jun 2009 20:42:20 +0000 (13:42 -0700)]
resolved conflicts for merge of
c494d7ce to master
Doug Zongker [Thu, 18 Jun 2009 15:43:44 +0000 (08:43 -0700)]
generate OTA packages that use edify
Split the details of generating script syntax into a generator class:
one for amend (whose output should be equivalent to the current
output), and one for edify.
Fix 'otatools' build rule to build imgdiff.
Joe Onorato [Thu, 18 Jun 2009 20:11:58 +0000 (13:11 -0700)]
Put the java source file list files somewhere where they don't
conflict with the .class files that are getting zipped up, and
delete them when we're done with them.
Doug Zongker [Thu, 18 Jun 2009 17:47:13 +0000 (10:47 -0700)]
am
602a84e0: fix releasetools for non-linux architectures
Merge commit '
602a84e0bbf1807a9403cfa50184241f6fc035c4'
* commit '
602a84e0bbf1807a9403cfa50184241f6fc035c4':
fix releasetools for non-linux architectures
Doug Zongker [Thu, 18 Jun 2009 15:35:12 +0000 (08:35 -0700)]
fix releasetools for non-linux architectures
The ota and img building scripts contained some hardcoded 'linux-x86'
paths. Remove and replace with a slightly redefined -p option.
Modify Makefile to pass correct -p when building.
The Android Open Source Project [Thu, 18 Jun 2009 16:33:04 +0000 (09:33 -0700)]
bumped version, cleaned up