Commit graph

996 commits

Author SHA1 Message Date
Doug Zongker
4647f12a4f 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.
2009-07-02 12:21:43 -07: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
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
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
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
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
Doug Zongker
b1134dd049 remember in the target-files package what version of the API recovery uses 2009-06-17 17:09:40 -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
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
Doug Zongker
37c0e274d1 fix building of otacerts.zip
Was using a variable which was only defined inside the rule, outside
the rule.  Change to use the correct variable.
2009-06-15 15:36:16 -07:00
Doug Zongker
8678df4c06 use releasetools scripts to build update and OTA packages
Use the python scripts in build/tools/releasetools (that are used to
build signed releases) to build packages within the Makefile as well.
2009-06-15 14:30:14 -07:00
Android (Google) Code Review
622a564e8f am 03474237: Merge change 4054 into donut
Merge commit '0347423753fb5d7207aa1ea93a8429f59468eb41'

* commit '0347423753fb5d7207aa1ea93a8429f59468eb41':
  build 'updater' binary for use in OTA packages
  Add VpnServices to PRODUCT_PACKAGES.
2009-06-14 21:12:39 -07:00
Doug Zongker
a406c1e7a1 build 'updater' binary for use in OTA packages 2009-06-12 16:57:08 -07:00
Doug Zongker
f55791f720 am 8b70e8c6: use minigzip instead of system gzip in the build
Merge commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78'

* commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78':
  use minigzip instead of system gzip in the build
2009-05-27 15:06:53 -07:00
Doug Zongker
8b70e8c657 use minigzip instead of system gzip in the build
Use zlib's minigzip utility, built as part of our source tree, instead of
whatever installation of GNU gzip happens to be on the user's machine.
Using zlib's deflater, which is nicely available as a library (unlike
GNU gzip's deflater) will ultimately let us do binary patches to the
boot and recovery images.
2009-05-27 14:27:45 -07:00
Android (Google) Code Review
4afb4f20fc am 3026e96d: Merge change 2245 into donut
Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:55:41 -07:00
Dianne Hackborn
ecc70d705a Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 14:54:07 -07:00
Robert Greenwalt
fbd10d940d Add PRODUCT_DEFAULT_WIFI_CHANNELS build var.
Allows the build to specify the default number of allowed
WIFI channels.  Part of the fix for 1625953.
2009-05-21 18:46:57 -07:00
Dianne Hackborn
9537884b0d Add new property for dev codename, update version to Donut. 2009-05-08 13:03:08 -07:00
Dima Zavin
6ea3b8856d core: Recovery image should have the custom kernel base as well.
Signed-off-by: Dima Zavin <dima@android.com>
2009-05-07 21:10:41 -07:00
Dima Zavin
1e0847c2fc core: Allow the board config to specify the kernel base address for mkbootimg
Signed-off-by: Dima Zavin <dima@android.com>
2009-05-07 19:50:51 -07:00
Joe Onorato
7b2845ab1a Don't rebuild the NOTICE files when building with mm, mmm, etc. 2009-04-30 13:52:50 -07:00
Joe Onorato
03fbe40d53 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
2009-04-13 08:31:16 -07:00
Joe Onorato
64d85d0d82 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
2009-04-09 19:31:12 -07:00
Doug Zongker
934de9b758 AI 144143: Define OTA_PUBLIC_KEYS to be the test keys in the otapackage
target as well.

Automated import of CL 144143
2009-04-02 01:15:57 -07:00
Doug Zongker
17c83cf22c AI 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.

Automated import of CL 144130
2009-04-01 15:48:46 -07:00
Sriram Raman
7b64124f0b Automated import from //branches/donutburger/...@142410,142410 2009-03-24 22:40:59 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
094268cf8c auto import from //depot/cupcake/@132589 2009-03-03 14:03:52 -08:00
The Android Open Source Project
a9b2249753 auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
The Android Open Source Project
4d23ccc023 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:28 -08:00
The Android Open Source Project
41977d7cd2 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
The Android Open Source Project
475fa12ade auto import from //branches/cupcake/...@130745 2009-02-10 15:43:57 -08:00
The Android Open Source Project
35cfb08c58 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:40 -08:00
The Android Open Source Project
ed18741e07 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00