Commit graph

3387 commits

Author SHA1 Message Date
Jean-Baptiste Queru
398aaee7d7 Tweak prelink map, more
Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
2011-06-17 07:33:52 -07:00
Jean-Baptiste Queru
15ced7e137 Merge prelink map tweaks
Change-Id: I86f101e250e53beb197f9ea46e7dfb7e44f20063
2011-06-16 20:17:34 -07:00
Jean-Baptiste Queru
d5f84555b6 Tweak prelink map
Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25
2011-06-16 20:06:05 -07:00
Jean-Baptiste Queru
fd64de9ae4 Merge prelink map tweaks
Change-Id: I11895037a7c5768f48f18b63274daaa4d25bc681
2011-06-16 18:37:22 -07:00
Jean-Baptiste Queru
91e2927545 Tweak prelink map
Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25
2011-06-16 18:36:55 -07:00
Jean-Baptiste Queru
142731256a Merge "Tweak prelink map" 2011-06-16 16:31:58 -07:00
Jean-Baptiste Queru
1c594eab70 Tweak prelink map
Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1
2011-06-16 16:17:52 -07:00
Jean-Baptiste Queru
14bf45f31d Merge "Switch back to mksh as the default" 2011-06-16 10:53:27 -07:00
Jean-Baptiste Queru
256b14b2f8 Switch back to mksh as the default
Change-Id: I4f39e8d8cc22520cd36f83f8675a716cc1ade1d9
2011-06-16 09:34:06 -07:00
Jean-Baptiste Queru
978f86ea54 Merge "Increase the Java heap size for droiddoc" 2011-06-06 08:12:31 -07:00
David Turner
c1705c9ad8 Merge "x86: Enable -fstack-protector" 2011-05-26 09:21:35 -07:00
Bruce Beare
e397dcccbb x86: Enable -fstack-protector
Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-05-26 08:53:04 -07:00
David Turner
4272b32a86 Merge "Clean up of X86 build flags" 2011-05-24 22:58:20 -07:00
Jean-Baptiste Queru
5d66a07d44 Merge "Use actual numbers in version numbers." 2011-05-19 13:57:00 -07:00
Mark D Horn
5812d7b469 Clean up of X86 build flags
Review and clean-up of both compiler and linker flags
to ensure proper usage and consistency for images, toolchain,
SDK, and NDK.

Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Author: Bruce Beare <bruce.j.beare@intel.com>
2011-05-18 14:10:58 -07:00
Jean-Baptiste Queru
5372220a1a Merge "Remove simulator from the lunch menu" 2011-05-12 08:04:50 -07:00
Jean-Baptiste Queru
b27cd8f802 Remove simulator from the lunch menu
Change-Id: I0d73b4722ce5126b64538ca7add2e55cd561c022
2011-05-11 10:40:43 -07:00
Jean-Baptiste Queru
174c15d067 Use actual numbers in version numbers.
This string is used in the browser user agent, and some
sites get confused when this isn't a dotted-number version
number into thinking that they should serve stripped down HTML.
This clears the confusion.

Change-Id: I6c959ff17c540a1f3808f19238b9eb93ba170d2e
2011-05-10 08:29:49 -07:00
David Turner
6f9b7562e3 am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
* commit 'd5565942437e2c0787822604921d034e9df5fc5d':
  x86: Disable stack-protector until bionic is fixed
2011-04-26 01:12:03 -07:00
David 'Digit' Turner
55a461c9b1 am f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
* commit 'f245dd7975abedcb35e30aca1b1e6e3eb273388d':
  full_x86-eng: Ensure we copy the PC bios files.
2011-04-26 00:36:59 -07:00
David Turner
d556594243 Merge "x86: Disable stack-protector until bionic is fixed" 2011-04-25 23:35:09 -07:00
David 'Digit' Turner
f245dd7975 Merge "full_x86-eng: Ensure we copy the PC bios files." 2011-04-25 23:25:38 -07:00
Dominic Binks
86175d2fd5 Increase the Java heap size for droiddoc
Increasing the Java heap for droiddoc generation from 768 to 1280
megabytes reduces build times by about 2-3 minutes. For fast
build servers this can reduce build times by around 30%. For
slower workstation class machines the build is reduced with no
other obvious undesirable side effects.

Change-Id: I4ff04318ae78fc7b5a5a0499bacfc5527e966ff6
2011-04-25 13:52:29 -07:00
Raphael Moll
cb6a22f591 am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit '2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
  Allow swtmenubar module to be buildable on Windows.
2011-04-15 14:56:41 -07:00
Raphael Moll
854354be69 am 531c0c33: Merge "Add swtmenubar.jar to SDK"
* commit '531c0c33a598632118c5bb5491f5d5295c607b18':
  Add swtmenubar.jar to SDK
2011-04-15 14:56:39 -07:00
Raphael Moll
2e4e3c9421 Merge "Allow swtmenubar module to be buildable on Windows." 2011-04-15 14:42:09 -07:00
Raphael Moll
531c0c33a5 Merge "Add swtmenubar.jar to SDK" 2011-04-15 14:42:05 -07:00
Raphael Moll
59ad18fa49 Allow swtmenubar module to be buildable on Windows.
Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
2011-04-14 21:25:44 -07:00
Raphael Moll
24434460b6 Add swtmenubar.jar to SDK
Change-Id: Ia46337875cb78bb6a01731008b9acbfa4657d0a9
2011-04-14 21:25:02 -07:00
Ying Wang
8c425a9d7c am 479ec682: Merge "Fix "argument list too long""
* commit '479ec68292c7ba17ab8e3d849cc1f186847f5cc5':
  Fix "argument list too long"
2011-04-14 10:17:34 -07:00
Ying Wang
479ec68292 Merge "Fix "argument list too long"" 2011-04-14 10:07:38 -07:00
Ying Wang
00985df83a Fix "argument list too long"
Bug http://b/issue?id=2718472

Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
2011-04-14 09:59:18 -07:00
David 'Digit' Turner
495283735e full_x86-eng: Ensure we copy the PC bios files.
This change ensures that building full_x86-eng will copy the
Bios files to the right location. This is necessary to launch
"emulator-x86" after building the system images.

Before this patch, one had to make the copy manually. Note that
sdk_x86-eng does not need this (the files are actually taken care
of in build/target/product/sdk.mk so will be copied even in case
of the ARM sdk build).

Change-Id: If70adead27c7997694ebc30561005d26a7358c34
2011-04-14 17:34:40 +02:00
Ying Wang
4d9a8556ff am e442c136: Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."
* commit 'e442c1361a9066d7a394c080273d5f93d77979e4':
  Add NDK crtbegin_so.o and crtend_so.o if they exist.
2011-04-11 15:35:17 -07:00
Ying Wang
e442c1361a Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist." 2011-04-11 10:14:51 -07:00
Ying Wang
cc737a5aa3 Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
2011-04-08 14:57:36 -07:00
Bruce Beare
6ddd4ead92 x86: Disable stack-protector until bionic is fixed
Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-04-01 09:09:18 -07:00
Ying Wang
fdc3192e68 resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
2011-03-31 17:00:13 -07:00
Ying Wang
54aa74ef5d am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit 'a9e5bb8a6b2b772b07214e4dd0004f6989285dd0':
  Use my-dir in a consistent way as others
2011-03-31 15:11:58 -07:00
Ying Wang
a9e5bb8a6b am f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit 'f78fb1d1516e1d7448871ad3a2a403b12ff25f1a':
  Use my-dir in a consistent way as others
2011-03-31 15:10:33 -07:00
Ying Wang
15fcee57aa am c5e45492: am 4c401b1a: Merge "Fix argument handling in runhat() function"
* commit 'c5e45492fad4c5e45c1d5f0726c25877a601338e':
  Fix argument handling in runhat() function
2011-03-31 15:01:53 -07:00
Ying Wang
c5e45492fa am 4c401b1a: Merge "Fix argument handling in runhat() function"
* commit '4c401b1aabf5ad09c152d5e308bb13124c0a2d24':
  Fix argument handling in runhat() function
2011-03-31 14:58:23 -07:00
Ying Wang
f78fb1d151 Merge "Use my-dir in a consistent way as others" 2011-03-31 14:54:56 -07:00
Ying Wang
4c401b1aab Merge "Fix argument handling in runhat() function" 2011-03-31 14:54:24 -07:00
Chris Dearman
f0bcf429d9 Fix argument handling in runhat() function
Change-Id: I22fa264a3db516dcbe0cc9109dc20d6c004d3418
Signed-off-by: Raghu Gandham <raghu@mips.com>
2011-03-31 14:45:03 -07:00
David 'Digit' Turner
dc620647ef am c09cc904: am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."
* commit 'c09cc904f183907111de57581d55c181df8ef47f':
  build speedup: Do not use shell 'find' function to look for NOTICE files.
2011-03-30 06:32:43 -07:00
David 'Digit' Turner
c09cc904f1 am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."
* commit 'dffd40587aff00c6852d64f5d7ed20d588bb993e':
  build speedup: Do not use shell 'find' function to look for NOTICE files.
2011-03-30 06:25:22 -07:00
David 'Digit' Turner
dffd40587a Merge "build speedup: Do not use shell 'find' function to look for NOTICE files." 2011-03-30 06:17:39 -07:00
David 'Digit' Turner
3e0e611e76 build speedup: Do not use shell 'find' function to look for NOTICE files.
The GNU Make wildcard function can be used to look for a specific file and
is _much_ faster than invoking the find command through $(shell ...).

Since notice_files.mk is included by base_rules.mk for each and every module
in the build tree, this represents a considerable speed-up. For example, when
building the full-eng product from the AOSP tree, the no-op "make" goes from
21 seconds to 16 seconds with this patch applied.

Change-Id: Ideb1bb74d5bfbb650834fa4b6e151ff24dcd0150
2011-03-29 14:27:27 +02:00
Raphael
a5b8a04086 am f0f1490d: am 57c70196: (-s ours) Merge "Merge c4d4731b4d: \'Build SDK repository\'. Do not merge."
* commit 'f0f1490d8bccdb74afb0a59f1a748cc01e8c1502':
  Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
2011-03-24 22:43:55 -07:00