Commit graph

201 commits

Author SHA1 Message Date
Jean-Baptiste Queru
04edc95a32 Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master
Conflicts:
	core/apicheck_msg_current.txt
2009-07-06 12:27:36 -07:00
Doug Zongker
8b3f93a7d5 am 6e9c1a6d: remove some accidentally-submitted debug logging
Merge commit '6e9c1a6dd0042e123941e59ad5da6fc569093fbb'

* commit '6e9c1a6dd0042e123941e59ad5da6fc569093fbb':
  remove some accidentally-submitted debug logging
2009-07-02 15:24:24 -07:00
Android (Google) Code Review
d77ccd3f1b 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.
2009-07-01 22:43:50 -07:00
Doug Zongker
acb8bda3bb am 0f3298a4: delete source files not in target
Merge commit '0f3298a497e32f6c2325a0071124a62d031fae6f'

* commit '0f3298a497e32f6c2325a0071124a62d031fae6f':
  delete source files not in target
2009-07-01 16:01:52 -07:00
Doug Zongker
6e9c1a6dd0 remove some accidentally-submitted debug logging 2009-07-01 14:18:59 -07:00
Android (Google) Code Review
a2bd9af947 Merge change 4759 into donut
* changes:
  	Removing top tabs from PDK navigation because right now we only have one section.
2009-06-30 13:53:47 -07:00
Doug Zongker
0f3298a497 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.
2009-06-30 08:16:58 -07:00
Doug Zongker
8e2f2b9b20 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.
2009-06-24 14:34:57 -07:00
Doug Zongker
a4ebcbb929 resolved conflicts for merge of e1c31bac to master 2009-06-24 13:58:30 -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
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
Sriram Raman
802965380c Don't install afar and dexpreopt-wrapper on system while building tests. 2009-06-22 17:16:37 -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
David Warren
66b14d8646 Removing top tabs from PDK navigation because right now we only have one section. 2009-06-19 10:14:37 -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
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
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
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
Doug Zongker
683baae8c9 am 048e7ca1: fix archive files being created with perms 000
Merge commit '048e7ca15f6391681490ce564bc71194adf146aa'

* commit '048e7ca15f6391681490ce564bc71194adf146aa':
  fix archive files being created with perms 000
2009-06-15 14:55:06 -07:00
Doug Zongker
048e7ca15f fix archive files being created with perms 000
In python 2.5 and earlier, ZipFile.writestr(filename, data) results in
the file being added to the archive with permissions 000.  (See
http://svn.python.org/view?view=rev&revision=65235.)  Work around this
by creating a ZipInfo object and setting the permissions explicitly.
2009-06-15 14:31:53 -07:00
Scott Main
5386f16364 am 398814fa: am 5eb58327: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '398814fa75ee05ba9e77dd0057c469cc92ffd73e'

* commit '398814fa75ee05ba9e77dd0057c469cc92ffd73e':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 21:13:21 -07:00
Android (Google) Code Review
3f7760eeb1 am e05806cc: Merge change 4057 into donut
Merge commit 'e05806cc152dfa88917ca61843d784bdd34c91ae'

* commit 'e05806cc152dfa88917ca61843d784bdd34c91ae':
  make applypatch into a static library
2009-06-14 20:49:34 -07:00
Scott Main
398814fa75 am 5eb58327: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '5eb5832751cad87021b9f1ad77f1c26952030884' into donut

* commit '5eb5832751cad87021b9f1ad77f1c26952030884':
  AI 149839: make the home page's announcement block expandable...
2009-06-14 20:45:16 -07:00
Scott Main
5eb5832751 AI 149839: make the home page's announcement block expandable...
primarily, this is to handle various lengths of text due to translations,
  but also allows us to be more flexible WRT the content for the top section.

Automated import of CL 149839
2009-06-12 14:02:40 -07:00
Gaurav Mathur
a0deb0fb7f - Changed page title to show "Android open source"
- Changed Tab name to "Dev Guide"
2009-06-12 13:47:16 -07:00
Android (Google) Code Review
e05806cc15 Merge change 4057 into donut
* changes:
  make applypatch into a static library
2009-06-12 09:45:14 -07:00
Doug Zongker
5a79087638 make applypatch into a static library
Turn the bulk of applypatch into a static library so it can be used
from the updater.  Also build it as a standalone executable for use by
the existing OTA mechanism.
2009-06-12 09:42:43 -07:00
Android (Google) Code Review
f6c53efe10 am 5aa29992: Merge change 3459 into donut
Merge commit '5aa299925d61f9d1e395c3c94f5f1f4566277fa8'

* commit '5aa299925d61f9d1e395c3c94f5f1f4566277fa8':
  make signapk strip other signatures
2009-06-12 08:26:01 -07:00
Android (Google) Code Review
5aa299925d Merge change 3459 into donut
* changes:
  make signapk strip other signatures
2009-06-11 19:25:14 -07:00
Doug Zongker
af482b62e5 make signapk strip other signatures
Change signapk to not propagate other signatures to the output
archive.  Multiple signatures seem to confuse the package manager, as
we saw with Maps, and other partners are checking in prebuilt APKs for
google experience devices signed with random other things.
2009-06-11 19:24:50 -07:00
Scott Main
08d69b0fbc am ed3a2d30: am 88ee3f4e: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300
Merge commit 'ed3a2d303de6110ef93d4570fd64550b31b55caa'

* commit 'ed3a2d303de6110ef93d4570fd64550b31b55caa':
  AI 149729: fix search functionatilty for offline docs...
2009-06-11 01:02:46 -07:00
Scott Main
ed3a2d303d am 88ee3f4e: AI 149729: fix search functionatilty for offline docs... the file references weren\'t using the local root. BUG=1909300
Merge commit '88ee3f4e032ba9fd0377b80b916dcc39b2ce1bf1' into donut

* commit '88ee3f4e032ba9fd0377b80b916dcc39b2ce1bf1':
  AI 149729: fix search functionatilty for offline docs...
2009-06-11 00:01:30 -07:00
Scott Main
88ee3f4e03 AI 149729: fix search functionatilty for offline docs...
the file references weren't using the local root.
  BUG=1909300

Automated import of CL 149729
2009-06-10 23:40:24 -07:00
Mathias Agopian
3344b2e9b2 break dependency on utils/ZipEntry.h and utils/ZipFile.h 2009-06-05 14:55:48 -07:00
Android (Google) Code Review
7cea5343b9 am 39528d6b: Merge change 3004 into donut
Merge commit '39528d6bace1457d21e76824fe94d85c880fe4be'

* commit '39528d6bace1457d21e76824fe94d85c880fe4be':
  fix the SDK build for real this time.
  support incremental updates of boot image
2009-06-02 23:22:21 -07:00
Android (Google) Code Review
39528d6bac Merge change 3004 into donut
* changes:
  fix the SDK build for real this time. the missing macros weren't declared in the proper order last time.
2009-06-02 23:20:15 -07:00
Scott Main
653726a40a fix the SDK build for real this time.
the missing macros weren't declared in the proper order last time.
2009-06-02 20:58:23 -07:00
Android (Google) Code Review
3cbc666362 Merge change 2951 into donut
* changes:
  support incremental updates of boot image
2009-06-02 17:41:30 -07:00
Android (Google) Code Review
ae8c03d9e7 am 34780ee3: Merge change 2982 into donut
Merge commit '34780ee3b6e9958e87e0d192e156806e3f30940f'

* commit '34780ee3b6e9958e87e0d192e156806e3f30940f':
  fix build break by reincluding empty method calls
2009-06-02 17:40:19 -07:00
Android (Google) Code Review
34780ee3b6 Merge change 2982 into donut
* changes:
  fix build break by reincluding empty method calls that were moved to macros.cs
2009-06-02 17:38:23 -07:00
Scott Main
a0f9bd1ef8 fix build break by reincluding empty method calls
that were moved to macros.cs
2009-06-02 17:35:25 -07:00
Doug Zongker
5da317e51d support incremental updates of boot image
Modify applypatch to be able to write MTD partitions as well as read
them.  Make applypatch save a backup copy of the contents of an MTD
partition it reads in cache, to be used in case an update is
interrupted while writing back to MTD.  Modify OTA package creation
script to send boot image updates in patch form.
2009-06-02 14:09:11 -07:00
Android (Google) Code Review
1604b78091 am 31dae454: Merge change 2146 into donut
Merge commit '31dae454b6c2c137f3218d9fa3d25784f4b3f232'

* commit '31dae454b6c2c137f3218d9fa3d25784f4b3f232':
  Implements the basic structure for providing localized documentation;
2009-06-02 11:38:54 -07:00