Commit Graph

460 Commits

Author SHA1 Message Date
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
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
Android (Google) Code Review
cf348b97bd Merge change 4232 into donut
* changes:
  use releasetools scripts to build update and OTA packages
2009-06-15 15:08:35 -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
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
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
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
Jason Sams
9e710a66c7 am e3eb0fae: joeo here. This localize command is unused and causes that execve error.
Merge commit 'e3eb0fae9994c809afdab720f26fee478b66c368'

* commit 'e3eb0fae9994c809afdab720f26fee478b66c368':
  joeo here.  This localize command is unused and causes that execve error.
2009-06-14 21:12:25 -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
Android (Google) Code Review
0347423753 Merge change 4054 into donut
* changes:
  Add VpnServices to PRODUCT_PACKAGES.
2009-06-13 01:43:22 -07:00
Doug Zongker
a406c1e7a1 build 'updater' binary for use in OTA packages 2009-06-12 16:57:08 -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
Jason Sams
e3eb0fae99 joeo here. This localize command is unused and causes that execve error. 2009-06-12 11:23:19 -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
Chung-yih Wang
9305cf95a8 am 67647752: Add keystore in the pathmap of frameworks base.
Merge commit '676477525bc40f7ccf196a6580480b9d44adabd8'

* commit '676477525bc40f7ccf196a6580480b9d44adabd8':
  Add keystore in the pathmap of frameworks base.
2009-06-12 08:25:39 -07:00
Hung-ying Tyan
69cce2a49c Add VpnServices to PRODUCT_PACKAGES. 2009-06-12 23:09:46 +08:00
Jean-Michel Trivi
7e09fc130c am 4175bb90: Removing "tts" from the list of directories containing source code under frameworks/base. This directory doesn\'t exist anymore after change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
Merge commit '4175bb90ae8e454416a956b3885995e59ac0454e'

* commit '4175bb90ae8e454416a956b3885995e59ac0454e':
  Removing "tts" from the list of directories containing source code
2009-06-12 04:59:35 -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
Chung-yih Wang
676477525b Add keystore in the pathmap of frameworks base. 2009-06-12 07:10:26 +08:00
Android (Google) Code Review
697d5a5c67 am fcae4f83: Merge change 3862 into donut
Merge commit 'fcae4f838d75fd3352198ac1c881cc1c97f51aab'

* commit 'fcae4f838d75fd3352198ac1c881cc1c97f51aab':
  Adding TtsService and PicoTts so they get included.
2009-06-11 11:41:28 -07:00
Cary Clark
312fa319aa am 81b459ce: (-s ours) do not merge : add clean step for webkit security fix
Merge commit '81b459ce0876971d4c692ff95e4e842c2d30a5f3'

* commit '81b459ce0876971d4c692ff95e4e842c2d30a5f3':
  do not merge : add clean step for webkit security fix
2009-06-11 11:41:18 -07:00
Jean-Michel Trivi
4175bb90ae Removing "tts" from the list of directories containing source code
under frameworks/base. This directory doesn't exist anymore after
change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
2009-06-11 10:16:52 -07:00
Android (Google) Code Review
fcae4f838d Merge change 3862 into donut
* changes:
  Adding TtsService and PicoTts so they get included.
2009-06-11 09:44:03 -07:00
Cary Clark
81b459ce08 do not merge : add clean step for webkit security fix 2009-06-11 11:04:19 -04:00
Android (Google) Code Review
da7f6c3d5f Merge change 3569
* changes:
  Fix the is_sdk_build check when installing the apns.
2009-06-11 05:04:06 -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
Charles Chen
3b741f51c6 Adding TtsService and PicoTts so they get included. 2009-06-10 20:17:53 -07:00
Android (Google) Code Review
63b5064d44 Merge change 3830
* changes:
  joeo here.  This localize command is unused and causes that execve error.
2009-06-10 18:56:34 -07:00
Jason Sams
7c805e8ee8 joeo here. This localize command is unused and causes that execve error. 2009-06-10 17:37:28 -07:00
Jaikumar Ganesh
4dd5eb0488 Add cleanspec only for SDK and simulator. 2009-06-09 22:34:35 -07:00
Jaikumar Ganesh
0942768af1 Bluez4 changes
Rename hcid to bluetoothd, modify include paths, add cleanspec
2009-06-09 17:20:47 -07:00
Sriram Raman
d9f7a05830 am f1a55f8b: Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
Merge commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf'

* commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf':
  Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
2009-06-09 16:09:43 -07:00
Sriram Raman
f1a55f8bfb Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
This should fix the common problem when googlelogin-client and google-framework are both included
2009-06-09 15:08:29 -07:00
Patrick Scott
1f04a3b8f4 Fix the is_sdk_build check when installing the apns.
This will install the big list of apns on non-sdk eng builds. This is very
helpful after a wipe data for those of us on Cingular.
2009-06-09 14:53:27 -04:00
Satish Sampath
835a2756ec am f4d7c620: Include WebSearchProvider in all builds.
Merge commit 'f4d7c620f158d70ac21db7a89cbb391a01bd6848'

* commit 'f4d7c620f158d70ac21db7a89cbb391a01bd6848':
  Include WebSearchProvider in all builds.
2009-06-09 08:02:41 -07:00