Commit Graph

2545 Commits

Author SHA1 Message Date
The Android Automerger a1bb8cd4e0 FRF40
Change-Id: I318dee92db24bebe11234cea595b864eb7caac34
2010-05-10 18:12:11 -07:00
The Android Automerger 8b674a0471 Merge branch 'froyo' into froyo-release 2010-05-10 18:11:58 -07:00
The Android Open Source Project f48c3ac39d am f7c63421: merge from open-source master
Merge commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670' into kraken

* commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670':
  Replace arm with proper variable for CPU/ABI
2010-05-10 11:11:09 -07:00
The Android Open Source Project f7c634216e merge from open-source master
Change-Id: Id99b6cbc613c6c7b9d1ef79274b1c28b808a32d4
2010-05-10 11:05:12 -07:00
Scott Main 758c0f3475 am de14ee57: am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit 'de14ee570176dbae4b0c6f098088d3872669175d' into kraken

* commit 'de14ee570176dbae4b0c6f098088d3872669175d':
  docs: lighten the "new" red. softens the effect and makes it more legible when selected
2010-05-10 10:28:29 -07:00
Scott Main de14ee5701 am 3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit '3494d9b3deeb9967be247bf31cdaa3fd30fb4207' into froyo-plus-aosp

* commit '3494d9b3deeb9967be247bf31cdaa3fd30fb4207':
  docs: lighten the "new" red. softens the effect and makes it more legible when selected
2010-05-10 10:26:20 -07:00
Scott Main 3494d9b3de docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
2010-05-10 10:01:13 -07:00
Scott Main dbd7b38eac am 9096ef38: am 3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '9096ef382a5c17f4a6618dd19ac203840d807e0a' into kraken

* commit '9096ef382a5c17f4a6618dd19ac203840d807e0a':
  add froyo graphic for homepage and fix css bug
2010-05-10 09:49:59 -07:00
Scott Main 9096ef382a am 3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '3044d243c99f46030521fce650add82db640046a' into froyo-plus-aosp

* commit '3044d243c99f46030521fce650add82db640046a':
  add froyo graphic for homepage and fix css bug
2010-05-10 09:43:15 -07:00
Chih-Chung Chang b9e030e52d Set no camera default for emulator/generic/sim builds.
Change-Id: I3c75d093bb48a9d10952d587c3e48bbcc227f139
2010-05-10 15:00:39 +08:00
Jean-Baptiste Queru 7bb4f10a96 Merge "Replace arm with proper variable for CPU/ABI" 2010-05-07 12:53:45 -07:00
Bruce Beare 9d4c5b1c20 Use a different kernel boot line for the disk installer.
Change-Id: I6b20386a24e1141bfe2a252b635243c235d46865
2010-05-07 11:51:30 -07:00
Scott Main 3044d243c9 Merge "add froyo graphic for homepage and fix css bug" into froyo 2010-05-07 11:32:12 -07:00
The Android Automerger 57904900d9 FRF37
Change-Id: I6e5c40cb315e84fd9d21f64c2a21e071fb4db4b9
2010-05-07 10:58:05 -07:00
The Android Automerger 25d1ecfc02 FRF36
Change-Id: I659c91146118ae9cb8270cd96a45fb2b96041c3c
2010-05-06 17:55:18 -07:00
The Android Automerger 07b4d3f8b0 Merge branch 'froyo' into froyo-release 2010-05-06 17:55:05 -07:00
Dan Bornstein 8a5d30e73a am 6e079d7e: am 03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.
Merge commit '6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068' into kraken

* commit '6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068':
  Allow for a slightly larger libwebcore, add another library to the list,
2010-05-06 16:31:01 -07:00
Dan Bornstein 6e079d7e3d am 03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.
Merge commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e' into froyo-plus-aosp

* commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e':
  Allow for a slightly larger libwebcore, add another library to the list,
2010-05-06 16:12:06 -07:00
Dan Bornstein 03fb96f01e Allow for a slightly larger libwebcore, add another library to the list,
correct/update a couple entries, and add a couple more comments.

Bug: 2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
2010-05-06 12:43:47 -07:00
Scott Main ae98747d7c add froyo graphic for homepage and fix css bug
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
2010-05-06 11:43:08 -07:00
The Android Automerger cb1affafb7 FRF35
Change-Id: I6251d32cd9dcaefefd1bd7d35e33e6a3a9c92f04
2010-05-05 22:11:46 -07:00
The Android Automerger 86e0e78862 Merge branch 'froyo' into froyo-release 2010-05-05 22:11:33 -07:00
The Android Open Source Project 7c1a018fd2 am f9e275b0: merge from open-source master
Merge commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e' into kraken

* commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e':
  Add support for x86 VirtualBox Emulation
2010-05-05 15:20:00 -07:00
The Android Open Source Project f9e275b0c7 merge from open-source master
Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d
2010-05-05 15:16:56 -07:00
Ying Wang 4e601a46a6 Merge "Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk" into froyo-release 2010-05-05 14:50:04 -07:00
Dan Bornstein ea4b1a8600 am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Merge commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b' into kraken

* commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b':
  Fixed a bunch of stuff in the prelink mappings file:
2010-05-05 14:39:24 -07:00
Dan Bornstein aed937ba46 am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Merge commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp

* commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a':
  Fixed a bunch of stuff in the prelink mappings file:
2010-05-05 14:37:24 -07:00
Dan Bornstein 3ca0e96a3a Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo 2010-05-05 14:36:04 -07:00
Bruce Beare 5b9f19e58f Replace arm with proper variable for CPU/ABI
Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7
2010-05-05 11:26:04 -07:00
Nick Kralevich 2915cc3e32 Enable NX protections
Add -Wa,--noexecstack and -Wl,-z,noexecstack as default
flags when compiling applications.  This enables NX
protections, which prevent code from executing on the
stack or heap.  NX protections can block a large number
of buffer overflow attacks, and is an important security
feature.

Change-Id: Iad4bab9f8664584ba6ce832a5318d07680d7a908
2010-05-05 11:09:52 -07:00
Bruce Beare a197281bc2 Use a property to enable the eth0 LAN port on the emulator
Change-Id: I26f4ec7fac9b7a8ad3013914967cf0f8fdec91ff
2010-05-05 09:52:23 -07:00
Bruce Beare f9f1a9d764 Add support for x86 VirtualBox Emulation
To make a VirtualBox install image,
  make installer_img
2010-05-05 09:52:09 -07:00
Dan Bornstein 7dfcfbc0d4 Fixed a bunch of stuff in the prelink mappings file:
* Added mappings for most of the libraries that didn't already
have them (as observed from my build).

* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.

* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).

* Added a bit of documentation about the whole deal.

Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.

Bug: 2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
2010-05-05 00:10:37 -07:00
Scott Main ac06ea783b am e59de21b: am 74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td
Merge commit 'e59de21b8af028929e5bb7c077f323ce8f19081b' into kraken

* commit 'e59de21b8af028929e5bb7c077f323ce8f19081b':
  fix css bug for paragraphs in table cells
2010-05-04 18:30:42 -07:00
Scott Main e59de21b8a am 74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td
Merge commit '74108deaf1747943a493751cbff9de321f1dd397' into froyo-plus-aosp

* commit '74108deaf1747943a493751cbff9de321f1dd397':
  fix css bug for paragraphs in table cells
2010-05-04 18:18:02 -07:00
Colin Cross 9ca2164414 build: Fix including WHOLE_STATIC_LIBRARIES in static libraries
Static libraries that include other static libraries were being incorrectly
built with .a files inside the top level .a file, as well as the .o files
that were extracted from the component .a files.  This patch fixes the
final ar call to only add .o files to the archive.

Change-Id: Ic1ff025129e3c379fa56b4da2f09e9f16ea3c4fb
2010-05-04 18:09:56 -07:00
Dianne Hackborn 93b016008f Add native include path.
Change-Id: Ic5d0b807467e8e673399a8a5f9b6702bc72960ab
2010-05-04 18:08:21 -07:00
Ying Wang 67bddace22 Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk
Change-Id: I733dd28a5df2542ba364095376c1ac033ef62bbd
http://b/issue?id=2650711
2010-05-04 17:24:28 -07:00
Scott Main 74108deaf1 fix css bug for paragraphs in table cells
- only select the direct descendant for p:last-child in a td

Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
2010-05-04 17:24:26 -07:00
The Android Open Source Project cf28b80398 am ae4e1455: merge from open-source master
Merge commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6' into kraken

* commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6':
  Adapt to new location of libcore
  Make expr more POSIXy
  generic_x86 support
  Remove obsolete machine-setup.html reference.
2010-05-03 16:13:22 -07:00
The Android Open Source Project ae4e14556b merge from open-source master
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
2010-05-03 16:11:04 -07:00
android-build SharedAccount 45470ec246 FRF33B
Change-Id: I43e4e71d977ff530cc36565a0450edded231a34b
2010-05-03 15:15:03 -07:00
Jean-Baptiste Queru f015e94dc8 Adapt to new location of libcore
Change-Id: I316355751db621d318a78dc6e844d6bf2c7fdc87
2010-05-03 09:52:03 -07:00
The Android Automerger beb113e8fe FRF33
Change-Id: I7991b820eb9ef0671dbbef2729dbfc3efd21e3af
2010-05-03 08:10:21 -07:00
The Android Automerger dc83d4ec77 Merge branch 'froyo' into froyo-release 2010-05-03 08:10:08 -07:00
Doug Zongker ed661dd632 am 1d37a0da: am 2ea21065: add metadata to OTA package in easily-parsed form
Merge commit '1d37a0dad827c9eb9ecde2cd8238a5c2a512c59d' into kraken

* commit '1d37a0dad827c9eb9ecde2cd8238a5c2a512c59d':
  add metadata to OTA package in easily-parsed form
2010-05-02 16:11:43 -07:00
Jean-Baptiste Queru 3c47ca33bd am 045d4af7: Adapt to new location of libcore
Merge commit '045d4af72d487ed3b21dfdf951ecb41ad5609a80' into kraken

* commit '045d4af72d487ed3b21dfdf951ecb41ad5609a80':
  Adapt to new location of libcore
2010-05-02 16:11:26 -07:00
Doug Zongker 1d37a0dad8 am 2ea21065: add metadata to OTA package in easily-parsed form
Merge commit '2ea21065b66da9819df92b37a79f0f87552ee331' into froyo-plus-aosp

* commit '2ea21065b66da9819df92b37a79f0f87552ee331':
  add metadata to OTA package in easily-parsed form
2010-04-30 14:24:34 -07:00
Jean-Baptiste Queru 045d4af72d Adapt to new location of libcore
Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
2010-04-30 13:22:56 -07:00
Jean-Baptiste Queru 60bc203660 Adapt to new location of libcore
Change-Id: I17a2f432f69bd0cb381e83b6395fb2ae6e4faf9d
2010-04-30 13:10:03 -07:00