Commit graph

1159 commits

Author SHA1 Message Date
Jean-Baptiste Queru
7751f426fe Tweak prelink map even more
Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0
2011-06-17 13:20:32 -07:00
Jean-Baptiste Queru
36c1f10dee Merge "Relax the constraint of 64bit build environment." 2011-06-17 11:19:14 -07:00
Ying Wang
2914f7f3b3 Relax the constraint of 64bit build environment.
Change-Id: Id349f424b122816f42c99769b629a9447986cf20
2011-06-17 11:18:10 -07:00
Jean-Baptiste Queru
82b96df215 Tweak prelink map
Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2
2011-06-17 11:15:00 -07:00
Jean-Baptiste Queru
398aaee7d7 Tweak prelink map, more
Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
2011-06-17 07:33:52 -07:00
Jean-Baptiste Queru
1c594eab70 Tweak prelink map
Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1
2011-06-16 16:17:52 -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
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
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
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 Turner
d556594243 Merge "x86: Disable stack-protector until bionic is fixed" 2011-04-25 23:35:09 -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
59ad18fa49 Allow swtmenubar module to be buildable on Windows.
Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
2011-04-14 21:25:44 -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
00985df83a Fix "argument list too long"
Bug http://b/issue?id=2718472

Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
2011-04-14 09:59:18 -07: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
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
f78fb1d151 Merge "Use my-dir in a consistent way as others" 2011-03-31 14:54:56 -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
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
bd0c91c8b9 Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629
2011-03-24 13:41:35 -07:00
Raphael
21a8b2459f Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: Id08a3a55a564938dbeb6e3dd170d4a9a7153ae6e
2011-03-24 11:19:07 -07:00
Ying Wang
7c7fbeaf1a am 7bbea4b5: Disable dexpreopt for unbundled build.
* commit '7bbea4b5c1f053cbe428025e9f9dec0e50bcc551':
  Disable dexpreopt for unbundled build.
2011-03-24 03:36:19 -07:00
Ying Wang
bef90c0ec0 am 3fd580d4: Fix dependency of prebuilt target non-static Java libraries.
* commit '3fd580d4e29657b812d3ab3c459487689a5f2da6':
  Fix dependency of prebuilt target non-static Java libraries.
2011-03-24 03:36:11 -07:00
Ying Wang
7bbea4b5c1 Disable dexpreopt for unbundled build.
Cherry-picked from Honeycomb.

Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885
2011-03-23 14:12:14 -07:00
Ying Wang
3fd580d4e2 Fix dependency of prebuilt target non-static Java libraries.
Cherry-picked from Honeycomb to fix a dependency issue when building
prebuilt shared library.

Change-Id: I0a9cd3835b50dcc130a5f211e89d6bd22478fd42
2011-03-23 12:01:49 -07:00
David 'Digit' Turner
440d7e1e5b am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
* commit '9fe6dc2c17ba6113ff4031feaeea7dac0ba5d5a3':
  Support target-specific sdk/build/tools.atree extension.
2011-03-23 11:07:51 -07:00
David 'Digit' Turner
74b0c36882 Support target-specific sdk/build/tools.atree extension.
The purpose of this patch is to add the ability to specify a
target-specific extension to sdk/build/tools.atree, under the
name sdk/build/tools.$(TARGET_ARCH).atree

This is needed to move x86-specific changes out of tools.atree
in order to fix the build of internal Android branches that
don't include other x86-related changes to the build system.

Another patch, following this patch, will fix the build itself
by moving the x86-stuff to sdk/build/tools.x86.atree.

NOTE: The root cause of the problem is that tools.atree
probably shouldn't be in the public AOSP repository, but
under development/build/ instead. However, fixing this
requires more drastic changes to the build system.

Change-Id: Ie365c55527bcad38e1e5248f618e2fd5a96431a1
2011-03-23 11:20:14 +01:00
David Turner
db0d59d1b4 am b1047a99: Merge changes I00c75f37,I1fc3cb49
* commit 'b1047a99ce8b8d62ef911c5dfba7183c32e80a70':
  x86: the -mbionic flag is needed for IA builds.
  x86: qemu emulator is the default build target
2011-03-22 06:03:40 -07:00
Bruce Beare
2e8283d9bc x86: the -mbionic flag is needed for IA builds.
Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-15 07:47:49 -07:00
Bruce Beare
18a130e98a x86: qemu emulator is the default build target
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-15 07:47:48 -07:00
David 'Digit' Turner
e9b1d0eee7 am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
* commit 'f8f95fc8b1a1eb19812fc55b230da3bfbe5272e5':
  Allow win_sdk build with USE_CCACHE=1
2011-03-15 03:59:52 -07:00
David 'Digit' Turner
f8f95fc8b1 Merge "Allow win_sdk build with USE_CCACHE=1" 2011-03-15 03:31:19 -07:00
David 'Digit' Turner
55aad08663 Allow win_sdk build with USE_CCACHE=1
This patch allows the Window sdk build (lunch sdk-eng; make win_sdk)
to work properly when USE_CCACHE is defined in the environment.

There is no Windows ccache prebuilt, but since we're cross-compiling
from Linux, detect it and use the linux prebuilt binary instead.

Note: Depends on https://review.source.android.com//#change,21755
      for a complete solution to the problem.

Change-Id: I0b1b59efae86ee7114225258c9ecf9f257913347
2011-03-15 01:01:32 +01:00
Chih-Wei Huang
e73c4bbc50 Use my-dir in a consistent way as others
Change-Id: I3fd0cc58b48d621b431d7dd05fb689c1917b530d
2011-03-11 11:48:48 +08:00
Raphael Moll
8755e2b2c2 am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
* commit 'e84739e942d19955248e1fc1ce966d56543eaf0e':
  Fix find-jdk-tools-jar to be cygwin-friendly.
2011-03-10 12:46:12 -08:00
Raphael Moll
e84739e942 Merge "Fix find-jdk-tools-jar to be cygwin-friendly." 2011-03-10 12:29:20 -08:00
Ying Wang
123995f9e1 am be188caf: Dist build.prop in sdk builds.
* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
  Dist build.prop in sdk builds.
2011-03-09 16:47:27 -08:00
Raphael Moll
4de32c69c7 Fix find-jdk-tools-jar to be cygwin-friendly.
Change-Id: I9cf2035026725fd1ba8a014b484262ed1acc1df4
2011-03-08 14:29:25 -08:00
Ying Wang
be188cafd2 Dist build.prop in sdk builds.
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
2011-03-08 14:05:51 -08:00
Ed Heyl
24297cabf4 Merge "version bump for new release (please don't merge)" into gingerbread 2011-03-08 12:35:20 -08:00