Commit Graph

502 Commits

Author SHA1 Message Date
Doug Zongker a4ebcbb929 resolved conflicts for merge of e1c31bac to master 2009-06-24 13:58:30 -07:00
Android (Google) Code Review 3fbb580c10 Merge change 5099
* changes:
  Move the BoardConfig.mk search and inclusion to core/config.mk.
2009-06-24 13:28:46 -07:00
Android (Google) Code Review 31424d6420 Merge change 5082
* changes:
  pass correct -s and -m options to release tools
2009-06-24 13:20:12 -07:00
Doug Zongker e1c31bacae 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.
2009-06-23 17:40:35 -07:00
Android (Google) Code Review 0fbd7da3cd am 55766e47: Merge change 5150 into donut
Merge commit '55766e47aaf4fe72a2b5cdd8aa60d14781c01e94'

* commit '55766e47aaf4fe72a2b5cdd8aa60d14781c01e94':
  don't fail if no required bootloaders are defined
2009-06-23 16:34:08 -07:00
Android (Google) Code Review 55766e47aa Merge change 5150 into donut
* changes:
  don't fail if no required bootloaders are defined
2009-06-23 16:32:18 -07:00
Doug Zongker 9fc74c7823 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.
2009-06-23 16:29:13 -07:00
Android (Google) Code Review 4179f16e48 Merge change 4992
* changes:
  Change to add the 4.4.0 toolchain directory to PATH.
2009-06-23 16:20:02 -07:00
Patrick Scott 87c86573e0 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.
2009-06-23 15:28:07 -04:00
Doug Zongker 659fc55e44 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.
2009-06-23 09:54:52 -07:00
Android (Google) Code Review ab81dbd1f4 am bf8a59aa: Merge change 5017 into donut
Merge commit 'bf8a59aa12dd8dd8ceb6eeeec22dd94b8332c228'

* commit 'bf8a59aa12dd8dd8ceb6eeeec22dd94b8332c228':
  Don't install afar and dexpreopt-wrapper on system while building tests.
2009-06-22 22:04:16 -07:00
Joe Onorato 6178e239e6 am 9d9f3678: Java 1.5 is required. Enforce it.
Merge commit '9d9f367895655411c42123177ae1c32f104b3c01'

* commit '9d9f367895655411c42123177ae1c32f104b3c01':
  Java 1.5 is required.  Enforce it.
2009-06-22 22:04:15 -07:00
Android (Google) Code Review bf8a59aa12 Merge change 5017 into donut
* changes:
  Don't install afar and dexpreopt-wrapper on system while building tests.
2009-06-22 18:24:30 -07:00
Joe Onorato 9d9f367895 Java 1.5 is required. Enforce it. 2009-06-22 18:15:38 -07:00
Doug Zongker e01100c7ac 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.
2009-06-22 17:46:19 -07:00
Sriram Raman 802965380c Don't install afar and dexpreopt-wrapper on system while building tests. 2009-06-22 17:16:37 -07:00
Jing Yu f28c6fabb6 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.
2009-06-22 16:03:34 -07:00
Doug Zongker 05d3dea519 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).
2009-06-22 15:09:22 -07:00
Andrei Popescu 09e82c0d93 force clean build of libwebcore after turning video on 2009-06-19 21:13:32 +01:00
Feng Qian 1f1759ef70 Add clean-libwebcore to clean spec. 2009-06-18 18:40:31 -07:00
Android (Google) Code Review 24254dbd6f am edb6829f: Merge change 4654 into donut
Merge commit 'edb6829f832bb79ba2e96ada74b3b971b73ad9a7'

* commit 'edb6829f832bb79ba2e96ada74b3b971b73ad9a7':
  Put the java source file list files somewhere where they don't
2009-06-18 13:58:02 -07:00
Android (Google) Code Review edb6829f83 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.
2009-06-18 13:52:57 -07:00
Doug Zongker ac4920a90b resolved conflicts for merge of c494d7ce to master 2009-06-18 13:42:20 -07:00
Doug Zongker c494d7cee8 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.
2009-06-18 13:19:07 -07:00
Joe Onorato 483d92412f 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.
2009-06-18 13:16:52 -07:00
Doug Zongker d6fb2d40b5 am 602a84e0: fix releasetools for non-linux architectures
Merge commit '602a84e0bbf1807a9403cfa50184241f6fc035c4'

* commit '602a84e0bbf1807a9403cfa50184241f6fc035c4':
  fix releasetools for non-linux architectures
2009-06-18 10:47:13 -07:00
Doug Zongker 602a84e0bb 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.
2009-06-18 10:43:55 -07:00
The Android Open Source Project 9af64663a3 bumped version, cleaned up 2009-06-18 09:33:04 -07:00
Android (Google) Code Review d67bb8630a Merge change 4496
* changes:
  Switch default toolchain to 4.4.0 in master.
2009-06-17 23:34:10 -07:00
Sriram Raman 916069c5bb am 1bc6248b: (-s ours) Fix the build name. Previously "DONUT-BURGER"; Now "Donut"
Merge commit '1bc6248b35ab8577466fa9e10a11d4a53725f0f5'

* commit '1bc6248b35ab8577466fa9e10a11d4a53725f0f5':
  Fix the build name. Previously "DONUT-BURGER"; Now "Donut"
2009-06-17 21:49:48 -07:00
Android (Google) Code Review 4b589a9759 am 3450f449: Merge change 4549 into donut
Merge commit '3450f44932dcf399349a95a780d9aabeac4eca00'

* commit '3450f44932dcf399349a95a780d9aabeac4eca00':
  AI 149924: Add OpenWnn to the SDK builds.
2009-06-17 21:49:45 -07:00
Android (Google) Code Review daadaaa308 am 1a28c1a4: Merge change 4541 into donut
Merge commit '1a28c1a4c1ad0c4adf0c63bb36f47394e9509360'

* commit '1a28c1a4c1ad0c4adf0c63bb36f47394e9509360':
  remember in the target-files package what version of the API recovery uses
2009-06-17 21:49:40 -07:00
Sriram Raman 1bc6248b35 Fix the build name. Previously "DONUT-BURGER"; Now "Donut" 2009-06-17 17:56:33 -07:00
Android (Google) Code Review 3450f44932 Merge change 4549 into donut
* changes:
  Merge commit 'b610c08b9605c31c1e5b851009104972e3822a3c' into Donut
2009-06-17 17:50:52 -07:00
Xavier Ducrohet 6f4a0f4f89 Merge commit 'b610c08b9605c31c1e5b851009104972e3822a3c' into Donut
Add OpenWnn to the SDk builds.
2009-06-17 17:40:27 -07:00
Android (Google) Code Review 1a28c1a4c1 Merge change 4541 into donut
* changes:
  remember in the target-files package what version of the API recovery uses
2009-06-17 17:22:15 -07:00
Doug Zongker b1134dd049 remember in the target-files package what version of the API recovery uses 2009-06-17 17:09:40 -07:00
Xavier Ducrohet b610c08b96 AI 149924: Add OpenWnn to the SDK builds.
Automated import of CL 149924
2009-06-17 16:59:26 -07:00
Android (Google) Code Review 99e5671b15 am 9454b1c8: Merge change 4089 into donut
Merge commit '9454b1c8b6d36e56b749bed06cfe7afb04a32375'

* commit '9454b1c8b6d36e56b749bed06cfe7afb04a32375':
  - Changed page title to show "Android open source"
2009-06-17 15:38:54 -07:00
Jing Yu b845c2fe20 Switch default toolchain to 4.4.0 in master. 2009-06-17 12:06:23 -07:00
Android (Google) Code Review 9454b1c8b6 Merge change 4089 into donut
* changes:
  - Changed page title to show "Android open source" - Changed Tab name to "Dev Guide"
2009-06-17 10:00:30 -07:00
Doug Zongker 38a649f873 handle BOARD_KERNEL_BASE in releasetools
Some devices define a BOARD_KERNEL_BASE argument which must be given
as an argument to mkbootimg when building a bootable image.  Store the
value of this var (if any) in the target-files zip and use it when
building images.
2009-06-17 09:07:09 -07:00
Android (Google) Code Review c0288c2cdb Merge change 4307
* changes:
  don't require some OTA features
2009-06-15 22:39:16 -07:00
Doug Zongker 171f1cde10 don't require some OTA features
Make the following things optional:
 - kernel command lines for bootable images
 - radio images
 - bootloader assertions
These are not all (yet?) defined for some new devices.
2009-06-15 22:36:37 -07:00
The Android Open Source Project 157064f0b6 manual merge of dddd957c, explicitly list SDK image dependencies
Merge commit 'dddd957c'
2009-06-15 22:21:14 -07:00
Doug Zongker dddd957c74 explicitly list SDK image dependencies
The SDK build used to have the update package as a dependency, in
order to force various image files to be built.  Now the the update
package can't be built for sdk-eng, list the individual images needed
instead.
2009-06-15 21:25:32 -07:00
The Android Open Source Project 93521c42e4 manual merge of 367910fc, don't build ota or update packages for sdk or sim
Merge commit '367910fc'
2009-06-15 19:29:10 -07:00
Doug Zongker 367910fc6d don't build ota or update packages for sdk or sim 2009-06-15 18:56:51 -07:00
The Android Open Source Project 61ceba259d manual merge of 37c0e274, fix building of otacerts.zip
Merge commit '37c0e274'
2009-06-15 18:12:44 -07:00
Android (Google) Code Review 6be991f074 am cf348b97: Merge change 4232 into donut
Merge commit 'cf348b97bdb52b7ffe7be0d17318b1fda425a211'

* commit 'cf348b97bdb52b7ffe7be0d17318b1fda425a211':
  use releasetools scripts to build update and OTA packages
2009-06-15 17:56:59 -07:00