Commit Graph

2192 Commits

Author SHA1 Message Date
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 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
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
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 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
Jean-Baptiste Queru f015e94dc8 Adapt to new location of libcore
Change-Id: I316355751db621d318a78dc6e844d6bf2c7fdc87
2010-05-03 09:52:03 -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
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 39025771f5 am 60bc2036: Adapt to new location of libcore 2010-04-30 13:20:41 -07:00
Jean-Baptiste Queru 60bc203660 Adapt to new location of libcore
Change-Id: I17a2f432f69bd0cb381e83b6395fb2ae6e4faf9d
2010-04-30 13:10:03 -07:00
Jean-Baptiste Queru 9e39fdb64a Adapt to new location of libcore
Change-Id: I248bd34ceb3394a4e8f10135ed6fba19d8343b3c
2010-04-30 12:55:18 -07:00
Alexey Tarasov 73fda1b973 Make expr more POSIXy
Change-Id: I939cf1f227c14112656804d69c1afd7ead4a31ed
2010-04-29 14:19:28 -07:00
Jean-Baptiste Queru e3ec6d120c Merge "generic_x86 support" 2010-04-29 07:16:36 -07:00
Bruce Beare c25e503207 generic_x86 support
Add in Makefiles and support files for x86 builds
  Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
  Additional changes by: Mark Gross <mark.gross@intel.com>
  Additional changes by: Bruce Beare <brucex.j.beare@intel.com>

Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-04-28 16:52:51 -07:00
Doug Zongker 2ea21065b6 add metadata to OTA package in easily-parsed form
This is only for use by the tools that manipulate OTA packages; it
doesn't touch device code.

Change-Id: I1e21b24b86340d8f86c9d15b2aeb79c461f75d18
2010-04-28 16:05:51 -07:00
The Android Open Source Project 345cbd2d25 am cd0bd801: merge from open-source master
Merge commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923' into kraken

* commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923':
  Fix "make layoutlib" under Windows+Cygwin
2010-04-28 15:58:23 -07:00
The Android Open Source Project cd0bd8011b merge from open-source master
Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46
2010-04-28 15:55:08 -07:00
Raphael Moll bfa25878f9 Remove obsolete machine-setup.html reference.
Bug 1231

Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
2010-04-28 14:30:44 -07:00
Scott Main 1053592f91 am e611eef0: am c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
Merge commit 'e611eef001a7c79ab5b89aef49235944d760806d' into kraken

* commit 'e611eef001a7c79ab5b89aef49235944d760806d':
  support a few more header levels for sidebox so the sidebox can
2010-04-27 14:31:46 -07:00
Scott Main e611eef001 am c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
Merge commit 'c3d808a727c2b42d48658e6fca06b1d4a9817f12' into froyo-plus-aosp

* commit 'c3d808a727c2b42d48658e6fca06b1d4a9817f12':
  support a few more header levels for sidebox so the sidebox can
2010-04-27 14:28:12 -07:00
Scott Main c3d808a727 Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo 2010-04-27 14:23:04 -07:00
Nick Kralevich 387e4d0601 LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS
A package can define a LOCAL_LDFLAGS.  If a LOCAL_LDFLAGS
exists, it should come after the global LDFLAGS, to allow
the local flags to override the global flags.

Change-Id: I6e44c17949c1f11c808d0ed3f327d63fb51a1468
2010-04-26 14:12:19 -07:00
Ying Wang ee79711322 Add ramdisk to dist. [DO NOT MERGE]
cherry-pick from master.
http://b/issue?id=2590492

Change-Id: I1a8f0313a486665847b27fb58ac9a57881d5e913
2010-04-26 11:27:55 -07:00
Raphael 649c4731b1 am 381ee392: am 9ca1628e: Support building Windows SDK under Linux.
Merge commit '381ee392e8ebba35cb65321415f4cdb537b446ed' into kraken

* commit '381ee392e8ebba35cb65321415f4cdb537b446ed':
  Support building Windows SDK under Linux.
2010-04-23 17:21:48 -07:00
Raphael 31a4f6ff4c am 575cf4dc: am 4c70244c: Make zipalign build for the Win SDK under Linux.
Merge commit '575cf4dc5e7d290858b1c11f4195694888a8164c' into kraken

* commit '575cf4dc5e7d290858b1c11f4195694888a8164c':
  Make zipalign build for the Win SDK under Linux.
2010-04-23 17:21:45 -07:00
Raphael 381ee392e8 am 9ca1628e: Support building Windows SDK under Linux.
Merge commit '9ca1628e3f565607e1fdef71b570d3ddb5ec09df' into froyo-plus-aosp

* commit '9ca1628e3f565607e1fdef71b570d3ddb5ec09df':
  Support building Windows SDK under Linux.
2010-04-23 17:15:13 -07:00
Raphael 575cf4dc5e am 4c70244c: Make zipalign build for the Win SDK under Linux.
Merge commit '4c70244cb1af8b2babd7750c2bd19aeb722e19e0' into froyo-plus-aosp

* commit '4c70244cb1af8b2babd7750c2bd19aeb722e19e0':
  Make zipalign build for the Win SDK under Linux.
2010-04-23 17:14:58 -07:00
Raphael 9ca1628e3f Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

(Merge master Change I9d08d0df)
2010-04-23 13:17:23 -07:00
Raphael 4c70244cb1 Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
2010-04-23 13:15:37 -07:00
Scott Main 7f418a518b support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct

Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
2010-04-23 11:41:30 -07:00
Scott Main 19ca463e87 am 55f1fca1: am d72731d2: docs: misc css changes make sidebox size match qv make figure align with right margin remove margins from the last <p> in a table cell
Merge commit '55f1fca10ee8419d10b25fa7d2ab5a1dc1278f0b' into kraken

* commit '55f1fca10ee8419d10b25fa7d2ab5a1dc1278f0b':
  docs: misc css changes
2010-04-20 17:37:28 -07:00
Scott Main 55f1fca10e am d72731d2: docs: misc css changes make sidebox size match qv make figure align with right margin remove margins from the last <p> in a table cell
Merge commit 'd72731d213269f63f2bb80631f02914800f556ad' into froyo-plus-aosp

* commit 'd72731d213269f63f2bb80631f02914800f556ad':
  docs: misc css changes
2010-04-20 17:33:03 -07:00
Scott Main 6f467f6206 am e3e590be: am f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo
Merge commit 'e3e590be4e7260beae0de164f07a199bc73bbcf8' into kraken

* commit 'e3e590be4e7260beae0de164f07a199bc73bbcf8':
  docs: add script to capture the ctrl+f key event (initiates 'find' search
2010-04-20 15:43:19 -07:00