Commit Graph

10548 Commits

Author SHA1 Message Date
Android (Google) Code Review
9e202af99c Merge change 8340 into donut
* changes:
  Merge commit 'f9f41d0dfdac6deb819f0cc0cb0270f504dbd4ed' into manualmergeDroiddoc
2009-07-24 17:40:27 -07:00
Android (Google) Code Review
eaf299f8b4 Merge change 8339 into donut
* changes:
  Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc
2009-07-24 17:40:17 -07:00
Sriram Raman
7b02ff0fdc am 1e96ac84: Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed. Don\'t have to re-specify exclusion list for the patch file construction.
Merge commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce'

* commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce':
  Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
2009-07-24 16:09:20 -07:00
Android (Google) Code Review
e85be87ee6 Merge change 3175 into donut
* changes:
  page load perfomance improvements... remove the lists.js file from the <head>, which slows down page load a lot (over 300K), and instead load it dynamically on page load. also remove navtree_data.js from the <head>, which also slows the load and is only used in the reference when in tree view. This file is now loaded during the initialization of the nav tree.
2009-07-24 16:04:56 -07:00
Sriram Raman
1e96ac8430 Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
Don't have to re-specify exclusion list for the patch file construction.
2009-07-24 14:24:35 -07:00
Mike Lockwood
4c7219640f cleanspec.mk: clean step for enabling GPS on passion
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-24 17:03:09 -04:00
Android Git Automerger
9c3b0d58c8 Merge commit '66ae61670d3ea69dd1cf72cf529c29654c07405e' 2009-07-24 12:48:15 -07:00
Android Git Automerger
1e30fe8990 Merge commit '90c23aa130d76db2c9e1c9c7285f65d310cc4e83' 2009-07-24 12:48:01 -07:00
Android Git Automerger
c41bda63a3 Merge commit '3455a3d4a1b5f59ccbcc2ac7268d11b03861c229' 2009-07-24 12:47:48 -07:00
Android Git Automerger
dabee36b79 Merge commit 'b003d89ee3a6d39a0ad3ca6e9c8a61f39ef3b92a' 2009-07-24 12:47:28 -07:00
Android Git Automerger
cb69dabbdd Merge commit '22bc517cdfb6b7ee5f90f61de425516c1d7b0245' 2009-07-24 12:47:17 -07:00
Android Git Automerger
72e108a1d4 Merge commit '7a7cd0d8a3ee6d061d7b505583cb791eec6124f5' 2009-07-24 12:47:03 -07:00
Android Git Automerger
358a48e12a merge 73ef8257ce from donut (resolved conflicts) 2009-07-24 12:46:51 -07:00
Android (Google) Code Review
66ae61670d Merge change 8517 into donut
* changes:
  Fix generic-userdebug build (don't build OTA for this target).
2009-07-24 12:35:21 -07:00
Sriram Raman
b11428e53b Fix generic-userdebug build (don't build OTA for this target). 2009-07-24 12:02:28 -07:00
James Dong
90c23aa130 DO NOT MERGE TO MASTER
remove opencore avc encoder DSO
bug 2001900
2009-07-24 11:50:47 -07:00
The Android Open Source Project
78aaa2e24f DRC24 2009-07-24 09:12:18 -07:00
The Android Open Source Project
faaa39b029 Merge commit 'remotes/goog/donut' into donut-release 2009-07-24 09:12:08 -07:00
The Android Open Source Project
117508ff3f ERC24 2009-07-24 08:35:26 -07:00
The Android Open Source Project
d7038a4ce7 Merge commit 'remotes/goog/master' into eclair-release 2009-07-24 08:35:15 -07:00
Eric Laurent
4cb0ae10ec Fix issue 2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked. 2009-07-24 06:56:02 -07:00
Android (Google) Code Review
ef9f4ea0b8 am 4d7c4348: Merge change 8295 into donut
Merge commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11'

* commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11':
  applypatch changes for patching recovery image
2009-07-23 23:58:04 -07:00
Doug Zongker
3455a3d4a1 don't try to build recovery patch in generic build 2009-07-23 20:06:57 -07:00
Doug Zongker
b003d89ee3 make path explicit when running imgdiff
The build servers don't run "lunch" before building, so they don't
have the same path as everyone else.  Explicitly set it when running
imgdiff.
2009-07-23 18:48:38 -07:00
Doug Zongker
22bc517cdf fix imgdiff/bsdiff dependencies
These should be regular dependencies, not order-only ones.
2009-07-23 18:27:43 -07:00
Doug Zongker
7a7cd0d8a3 fix system size calculation for SDK build
The SDK build doesn't have recovery, don't try to generate a patch or
include it in the system image size calculation.  Also there's a
dependency on bsdiff that was omitted.
2009-07-23 17:58:54 -07:00
Android (Google) Code Review
186f7a049f am 076f0bfb: Merge change 8313 into donut
Merge commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61'

* commit '076f0bfbab74f725f2c643b8639efe2bb05a0f61':
  Fixed PDK links that point to the Creative Commons License
2009-07-23 16:25:46 -07:00
Marco Nelissen
9ccf6197ad am 33a76aa9: Clean step to remove silent ringtone.
Merge commit '33a76aa9199583ff0a53900ba8ebe2b4c39d85ed'

* commit '33a76aa9199583ff0a53900ba8ebe2b4c39d85ed':
  Clean step to remove silent ringtone.
2009-07-23 16:25:28 -07:00
Android (Google) Code Review
8c0a4655e7 Merge change 8404
* changes:
  add librs and librs_jni to the prelink map.
2009-07-23 15:24:45 -07:00
Jason Sams
511569b76e add librs and librs_jni to the prelink map. 2009-07-23 15:15:13 -07:00
Doug Zongker
73ef8257ce use a binary patch to install recovery from system
Instead of storing the whole recovery image in system in order to
flash it on first boot, we instead use an imgdiff patch from the boot
image to create the recovery image.  This is substantially smaller
since it effectively only stores the recovery binary and UI images
(the kernel and the init binary are identical to that of the boot
image).

This change modifies the OTA-building script to create and install
these patches, and changes the calculation of the system image size in
the Makefile to reflect the new scheme.
2009-07-23 15:12:53 -07:00
Jack Palevich
b58ec9f0c8 Merge commit '2613966d' into manualmerge
Conflicts:
	cleanspec.mk
2009-07-23 13:23:09 -07:00
Android (Google) Code Review
4d7c434807 Merge change 8295 into donut
* changes:
  applypatch changes for patching recovery image
2009-07-23 12:38:03 -07:00
Jesse Wilson
cfcbcf2856 Merge commit '289d80ee' into manualmerge2
Conflicts:
	tools/droiddoc/src/DroidDoc.java
	tools/droiddoc/test/stubs/func.sh
2009-07-23 11:10:14 -07:00
Android (Google) Code Review
076f0bfbab Merge change 8313 into donut
* changes:
  Fixed PDK links that point to the Creative Commons License
2009-07-23 10:45:57 -07:00
android-build SharedAccount
d04ebbc954 DRC23 2009-07-23 09:25:30 -07:00
android-build SharedAccount
14b7cb1f54 Merge commit 'remotes/goog/donut' into donut-release 2009-07-23 09:24:44 -07:00
Marco Nelissen
33a76aa919 Clean step to remove silent ringtone. 2009-07-23 09:23:44 -07:00
The Android Open Source Project
2e971c60fd ERC23 2009-07-23 08:36:45 -07:00
The Android Open Source Project
7cf1d604ae Merge commit 'remotes/goog/master' into eclair-release 2009-07-23 08:36:35 -07:00
Gaurav Mathur
eea8234481 Fixed PDK links that point to the Creative Commons License 2009-07-22 20:27:12 -07:00
Doug Zongker
6c770467fb applypatch changes for patching recovery image
Make some changes needed to applypatch in order to store the recovery
image in the system partition as a binary patch relative to the boot
image:

  - make applypatch use shared libraries, so it's smaller.  It will
    need to be on the main system so it can install the recovery
    image.  Make an applypatch_static binary for use in recovery
    packages (still needed for updating cupcake devices to donut).

  - output the results of patching to an in-memory buffer and write
    that to the partition; there's no convenient /tmp for us to us.
    (This should be basically a no-op in recovery, since /tmp is a
    ramdisk anyway.)
2009-07-22 19:15:59 -07:00
Dirk Dougherty
2e45d6ac47 Merge commit 'f9f41d0dfdac6deb819f0cc0cb0270f504dbd4ed' into manualmergeDroiddoc 2009-07-22 19:01:46 -07:00
Dirk Dougherty
f267149426 Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc 2009-07-22 19:01:20 -07:00
Jack Palevich
2613966d5d Clean up after removing android.opengl.Version 2009-07-22 16:04:39 -07:00
Doug Zongker
0493e240fd make bootloader requirements optional
Interpret a "*" in the "require version-bootloader" line as "don't
require any specific bootloader".  Sholes OTAs include the bootloader
and the main system in the same package.
2009-07-22 09:28:25 -07:00
The Android Open Source Project
79e2f4ceb3 DRC22 2009-07-22 08:36:11 -07:00
The Android Open Source Project
85645a7164 Merge commit 'remotes/goog/donut' into donut-release 2009-07-22 08:35:56 -07:00
The Android Open Source Project
375fe38bbc ERC22 2009-07-22 08:35:45 -07:00
The Android Open Source Project
7f5c3d1d7f Merge commit 'remotes/goog/master' into eclair-release 2009-07-22 08:35:33 -07:00