Commit Graph

2274 Commits

Author SHA1 Message Date
Dan Bornstein 7cb5e10f63 resolved conflicts for merge of 541c3f81 to master
Change-Id: I1a58398c79e538db8bac65b9f4d92028f1eca69e
2010-05-06 17:03:04 -07:00
Dan Bornstein 541c3f8138 am 8a5d30e7: 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. 2010-05-06 16:32:50 -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
The Android Open Source Project f7a6c9016b am ccb0c7cd: am 7c1a018f: am f9e275b0: merge from open-source master 2010-05-05 17:50:53 -07:00
Dan Bornstein 938179808d resolved conflicts for merge of 54c29015 to master
Change-Id: I0b45ef84343289e84c6bcdf64b6ca4c0aff414c5
2010-05-05 16:24:13 -07:00
The Android Open Source Project ccb0c7cd00 am 7c1a018f: am f9e275b0: merge from open-source master 2010-05-05 15:43:45 -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
Dan Bornstein 54c2901519 am ea4b1a86: am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo 2010-05-05 14:40:55 -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
Nick Kralevich e6f47ace30 am 8084f8c1: am 2915cc3e: Enable NX protections 2010-05-05 12:52:15 -07:00
Nick Kralevich 8084f8c123 am 2915cc3e: Enable NX protections 2010-05-05 12:51:22 -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
Scott Main c621843d82 am 41e5e60b: am ac06ea78: am e59de21b: am 74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td 2010-05-05 11:07:55 -07:00
Colin Cross 6c6ab0a753 am 80d38729: am 9ca21644: build: Fix including WHOLE_STATIC_LIBRARIES in static libraries 2010-05-05 11:07:53 -07:00
Dianne Hackborn 7eab0d8b57 am 7fa3aa53: am 93b01600: Add native include path. 2010-05-05 11:07:49 -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 41e5e60bfe am ac06ea78: am e59de21b: am 74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td 2010-05-04 22:18:40 -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 80d38729fe am 9ca21644: build: Fix including WHOLE_STATIC_LIBRARIES in static libraries 2010-05-04 18:17:51 -07:00
Dianne Hackborn 7fa3aa533b am 93b01600: Add native include path. 2010-05-04 18:17:48 -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
Jesse Wilson 3600a1604a Undo commit: Moving junit out of core.jar and into core-junit.jar
Change-Id: I09875ef5f45b1d643ae389a6871cad374d80746b
2010-05-04 17:27:15 -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
Jesse Wilson 0138b62418 Merge "Moving junit out of core.jar and into core-junit.jar." 2010-05-04 17:22:49 -07:00
Jesse Wilson 72c941a147 Moving junit out of core.jar and into core-junit.jar.
Also extending the arbitrary limit on build argument sizes,
which I ran up against in building after this change.

Change-Id: Iba79a37b27e7d5efa2b02a99aa253a2eec7ede75
2010-05-04 16:33:49 -07:00
Shimeng (Simon) Wang 1999eb77fe Merge "Change buildspec to allow disabling SVG." 2010-05-04 15:17:17 -07:00
Shimeng (Simon) Wang af168fe267 Change buildspec to allow disabling SVG.
Change-Id: Ia1a8fab6118f39ca10ca8df2254bef5466e54d75
2010-05-04 10:22:40 -07:00
The Android Open Source Project eaf130ec2c am 58248935: am cf28b803: am ae4e1455: merge from open-source master 2010-05-03 16:16:25 -07:00
The Android Open Source Project 5824893557 am cf28b803: am ae4e1455: merge from open-source master 2010-05-03 16:14:48 -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
Vasu Nori 2d2e4884eb Merge "fix searching of ancestors for removed methods" 2010-05-03 13:24:00 -07:00
Jean-Baptiste Queru f015e94dc8 Adapt to new location of libcore
Change-Id: I316355751db621d318a78dc6e844d6bf2c7fdc87
2010-05-03 09:52:03 -07:00
Ying Wang 5b59f6b08c Use sdk as the bootstrap classpath while compiling against sdk.
Change-Id: Iad16b8c03d88d138abee5e24433b6a654fa21410
http://b/issue?id=2623361
2010-05-03 09:47:12 -07:00
Doug Zongker 027dcb47de am 5324cb81: am ed661dd6: am 1d37a0da: am 2ea21065: add metadata to OTA package in easily-parsed form 2010-05-02 16:15:40 -07:00
Jean-Baptiste Queru 2b1301113f am be712cd5: am 3c47ca33: am 045d4af7: Adapt to new location of libcore 2010-05-02 16:15:39 -07:00
Doug Zongker 5324cb81c1 am ed661dd6: am 1d37a0da: am 2ea21065: add metadata to OTA package in easily-parsed form 2010-05-02 16:13:45 -07:00
Jean-Baptiste Queru be712cd5dd am 3c47ca33: am 045d4af7: Adapt to new location of libcore 2010-05-02 16:13:43 -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
Jean-Baptiste Queru d87972ffca am 39025771: am 60bc2036: Adapt to new location of libcore 2010-04-30 15:08:50 -07:00
Jean-Baptiste Queru 6973c43684 am 9e39fdb6: Adapt to new location of libcore 2010-04-30 15:08:26 -07:00