OSDN Git Service
Raphael Moll [Wed, 22 Jun 2011 17:35:20 +0000 (10:35 -0700)]
am
169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '
169c19ccb566d72a8ea142afb2550f9c54c5fea9':
Envsetup: Cygwin doesn't have 'ps -o command'.
Raphael Moll [Wed, 22 Jun 2011 17:17:02 +0000 (10:17 -0700)]
Merge "Envsetup: Cygwin doesn't have 'ps -o command'."
Raphael Moll [Mon, 20 Jun 2011 23:03:14 +0000 (16:03 -0700)]
Envsetup: Cygwin doesn't have 'ps -o command'.
Running build/envsetup.sh on cygwin always shows a
warning since there is no 'ps -o command' option.
Bash already sets SHELL=/bin/bash so we can rely on that if present.
Change-Id: I145b42508985735ba61d2b53b216ecc56e321943
David 'Digit' Turner [Mon, 20 Jun 2011 15:47:29 +0000 (08:47 -0700)]
am
04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '
04b963a1c037a7e9e8b5fb46603e009965293d9d':
emulator: Build emulator platform images as ARMv7-A
David 'Digit' Turner [Mon, 20 Jun 2011 13:56:36 +0000 (06:56 -0700)]
Merge "emulator: Build emulator platform images as ARMv7-A"
Jean-Baptiste Queru [Fri, 17 Jun 2011 21:08:22 +0000 (14:08 -0700)]
am
1894085d: Merge "Tweak prelink map even more"
* commit '
1894085d6e765878a928d901d1c91b16f9616d96':
Tweak prelink map even more
Jean-Baptiste Queru [Fri, 17 Jun 2011 20:50:05 +0000 (13:50 -0700)]
Merge "Tweak prelink map even more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 20:20:32 +0000 (13:20 -0700)]
Tweak prelink map even more
Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:02:44 +0000 (12:02 -0700)]
am
36c1f10d: Merge "Relax the constraint of 64bit build environment."
* commit '
36c1f10dee646935d73106a01b1d50628b9a2dcb':
Relax the constraint of 64bit build environment.
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:59:32 +0000 (11:59 -0700)]
am
9d7590b9: Merge "Tweak prelink map"
* commit '
9d7590b93ff549cf8a4b432932fa68799166ed79':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:19:14 +0000 (11:19 -0700)]
Merge "Relax the constraint of 64bit build environment."
Ying Wang [Tue, 24 May 2011 22:46:15 +0000 (15:46 -0700)]
Relax the constraint of 64bit build environment.
Change-Id: Id349f424b122816f42c99769b629a9447986cf20
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:15:36 +0000 (11:15 -0700)]
Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:15:00 +0000 (11:15 -0700)]
Tweak prelink map
Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:57:22 +0000 (07:57 -0700)]
am
f771489d: Merge "Tweak prelink map, more"
* commit '
f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
Tweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:43:02 +0000 (07:43 -0700)]
Merge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:33:52 +0000 (07:33 -0700)]
Tweak prelink map, more
Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:22:36 +0000 (20:22 -0700)]
am
15ced7e1: Merge prelink map tweaks
* commit '
15ced7e137017befbae5bdde3b7ff60a27d897d4':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:17:28 +0000 (20:17 -0700)]
Merge prelink map tweaks
Change-Id: I86f101e250e53beb197f9ea46e7dfb7e44f20063
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map
Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:52:34 +0000 (18:52 -0700)]
am
fd64de9a: Merge prelink map tweaks
* commit '
fd64de9ae410b6bfe024971bd543d42286d2990f':
Tweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:37:07 +0000 (18:37 -0700)]
Merge prelink map tweaks
Change-Id: I11895037a7c5768f48f18b63274daaa4d25bc681
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map
Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:09:14 +0000 (17:09 -0700)]
am
14273125: Merge "Tweak prelink map"
* commit '
142731256afc708f4ec07247bffbe733dcaed0f4':
Tweak prelink map
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:31:58 +0000 (16:31 -0700)]
Merge "Tweak prelink map"
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:17:42 +0000 (16:17 -0700)]
Tweak prelink map
Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1
Jean-Baptiste Queru [Thu, 16 Jun 2011 18:39:18 +0000 (11:39 -0700)]
am
14bf45f3: Merge "Switch back to mksh as the default"
* commit '
14bf45f31d99cdaa5cc0c46efa3f2c2724704173':
Switch back to mksh as the default
Jean-Baptiste Queru [Thu, 16 Jun 2011 17:53:27 +0000 (10:53 -0700)]
Merge "Switch back to mksh as the default"
Jean-Baptiste Queru [Thu, 16 Jun 2011 16:25:58 +0000 (09:25 -0700)]
Switch back to mksh as the default
Change-Id: I4f39e8d8cc22520cd36f83f8675a716cc1ade1d9
David 'Digit' Turner [Wed, 15 Jun 2011 13:33:24 +0000 (15:33 +0200)]
emulator: Build emulator platform images as ARMv7-A
Now that the emulator supports proper ARMv7 emulation, switch to
building all emulator-specific platform images using this instruction
set, in order to benefit from the noticeable speed boost provided by
Thumb-2 instructions.
Note that we don't build with NEON support because emulated NEON
instructions are currently slow, though they work.
IMPORTANT: You need to have the following emulator patch in your tree
in order to start these platform builds easily:
https://review.source.android.com//#change,23798
Otherwise, the alternative is to do these things:
1/ Telling the emulator to emulate an ARMv7-A CPU, instead of
an ARMv5TE one. This is normally done with "-qemu cortex-a8"
2/ Using an ARMv7-A capable kernel image, which is available and
usable with -kernel prebuilt/android-arm/kernel-qemu-armv7
Note that the emulator has a special hack that automatically enables
1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7,
then emulate an ARMv7-A CPU automatically).
So in reality, only 2/ is required.
Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:19:48 +0000 (08:19 -0700)]
am
978f86ea: Merge "Increase the Java heap size for droiddoc"
* commit '
978f86ea5439ce192e9c343fc2565f1ec4e2e6d2':
Increase the Java heap size for droiddoc
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:12:31 +0000 (08:12 -0700)]
Merge "Increase the Java heap size for droiddoc"
Jean-Baptiste Queru [Wed, 1 Jun 2011 21:09:24 +0000 (14:09 -0700)]
Merge from gingerbread
Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689
Jean-Baptiste Queru [Tue, 31 May 2011 21:03:21 +0000 (14:03 -0700)]
Merge "Relax the constraint of 64bit build environment." into gingerbread
David Turner [Thu, 26 May 2011 16:21:35 +0000 (09:21 -0700)]
Merge "x86: Enable -fstack-protector"
Bruce Beare [Wed, 4 May 2011 03:59:58 +0000 (20:59 -0700)]
x86: Enable -fstack-protector
Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
David Turner [Wed, 25 May 2011 05:58:20 +0000 (22:58 -0700)]
Merge "Clean up of X86 build flags"
Ying Wang [Tue, 24 May 2011 22:46:15 +0000 (15:46 -0700)]
Relax the constraint of 64bit build environment.
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
Jean-Baptiste Queru [Thu, 19 May 2011 20:57:00 +0000 (13:57 -0700)]
Merge "Use actual numbers in version numbers."
Mark D Horn [Tue, 26 Apr 2011 21:15:26 +0000 (14:15 -0700)]
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>
Jean-Baptiste Queru [Thu, 12 May 2011 15:04:50 +0000 (08:04 -0700)]
Merge "Remove simulator from the lunch menu"
Jean-Baptiste Queru [Wed, 11 May 2011 17:40:43 +0000 (10:40 -0700)]
Remove simulator from the lunch menu
Change-Id: I0d73b4722ce5126b64538ca7add2e55cd561c022
Jean-Baptiste Queru [Tue, 10 May 2011 15:29:49 +0000 (08:29 -0700)]
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
David Turner [Tue, 26 Apr 2011 08:12:03 +0000 (01:12 -0700)]
am
d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
* commit '
d5565942437e2c0787822604921d034e9df5fc5d':
x86: Disable stack-protector until bionic is fixed
David 'Digit' Turner [Tue, 26 Apr 2011 07:36:59 +0000 (00:36 -0700)]
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.
David Turner [Tue, 26 Apr 2011 06:35:09 +0000 (23:35 -0700)]
Merge "x86: Disable stack-protector until bionic is fixed"
David 'Digit' Turner [Tue, 26 Apr 2011 06:25:37 +0000 (23:25 -0700)]
Merge "full_x86-eng: Ensure we copy the PC bios files."
Dominic Binks [Wed, 9 Mar 2011 20:11:19 +0000 (12:11 -0800)]
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
Raphael Moll [Fri, 15 Apr 2011 21:56:41 +0000 (14:56 -0700)]
am
2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit '
2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
Allow swtmenubar module to be buildable on Windows.
Raphael Moll [Fri, 15 Apr 2011 21:56:39 +0000 (14:56 -0700)]
am
531c0c33: Merge "Add swtmenubar.jar to SDK"
* commit '
531c0c33a598632118c5bb5491f5d5295c607b18':
Add swtmenubar.jar to SDK
Raphael Moll [Fri, 15 Apr 2011 21:42:09 +0000 (14:42 -0700)]
Merge "Allow swtmenubar module to be buildable on Windows."
Raphael Moll [Fri, 15 Apr 2011 21:42:05 +0000 (14:42 -0700)]
Merge "Add swtmenubar.jar to SDK"
Raphael Moll [Fri, 15 Apr 2011 04:19:10 +0000 (21:19 -0700)]
Allow swtmenubar module to be buildable on Windows.
Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
Raphael Moll [Thu, 14 Apr 2011 06:49:21 +0000 (23:49 -0700)]
Add swtmenubar.jar to SDK
Change-Id: Ia46337875cb78bb6a01731008b9acbfa4657d0a9
Ying Wang [Thu, 14 Apr 2011 17:17:34 +0000 (10:17 -0700)]
am
479ec682: Merge "Fix "argument list too long""
* commit '
479ec68292c7ba17ab8e3d849cc1f186847f5cc5':
Fix "argument list too long"
Ying Wang [Thu, 14 Apr 2011 17:07:38 +0000 (10:07 -0700)]
Merge "Fix "argument list too long""
Ying Wang [Thu, 27 May 2010 18:55:39 +0000 (11:55 -0700)]
Fix "argument list too long"
Bug http://b/issue?id=
2718472
Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
David 'Digit' Turner [Thu, 14 Apr 2011 15:34:40 +0000 (17:34 +0200)]
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
Ying Wang [Mon, 11 Apr 2011 22:35:17 +0000 (15:35 -0700)]
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.
Ying Wang [Mon, 11 Apr 2011 17:14:51 +0000 (10:14 -0700)]
Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."
Ying Wang [Fri, 8 Apr 2011 21:57:36 +0000 (14:57 -0700)]
Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
Bruce Beare [Fri, 1 Apr 2011 16:09:02 +0000 (09:09 -0700)]
x86: Disable stack-protector until bionic is fixed
Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Ying Wang [Fri, 1 Apr 2011 00:00:13 +0000 (17:00 -0700)]
resolved conflicts for merge of
bd0c91c8 to gingerbread-plus-aosp
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
Ying Wang [Thu, 31 Mar 2011 22:11:58 +0000 (15:11 -0700)]
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
Ying Wang [Thu, 31 Mar 2011 22:10:33 +0000 (15:10 -0700)]
am
f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit '
f78fb1d1516e1d7448871ad3a2a403b12ff25f1a':
Use my-dir in a consistent way as others
Ying Wang [Thu, 31 Mar 2011 22:01:53 +0000 (15:01 -0700)]
am
c5e45492: am
4c401b1a: Merge "Fix argument handling in runhat() function"
* commit '
c5e45492fad4c5e45c1d5f0726c25877a601338e':
Fix argument handling in runhat() function
Ying Wang [Thu, 31 Mar 2011 21:58:23 +0000 (14:58 -0700)]
am
4c401b1a: Merge "Fix argument handling in runhat() function"
* commit '
4c401b1aabf5ad09c152d5e308bb13124c0a2d24':
Fix argument handling in runhat() function
Ying Wang [Thu, 31 Mar 2011 21:54:56 +0000 (14:54 -0700)]
Merge "Use my-dir in a consistent way as others"
Ying Wang [Thu, 31 Mar 2011 21:54:24 +0000 (14:54 -0700)]
Merge "Fix argument handling in runhat() function"
Chris Dearman [Wed, 16 Feb 2011 20:16:09 +0000 (12:16 -0800)]
Fix argument handling in runhat() function
Change-Id: I22fa264a3db516dcbe0cc9109dc20d6c004d3418
Signed-off-by: Raghu Gandham <raghu@mips.com>
David 'Digit' Turner [Wed, 30 Mar 2011 13:32:43 +0000 (06:32 -0700)]
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.
David 'Digit' Turner [Wed, 30 Mar 2011 13:25:22 +0000 (06:25 -0700)]
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.
David 'Digit' Turner [Wed, 30 Mar 2011 13:17:39 +0000 (06:17 -0700)]
Merge "build speedup: Do not use shell 'find' function to look for NOTICE files."
David 'Digit' Turner [Tue, 29 Mar 2011 12:27:27 +0000 (14:27 +0200)]
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
Raphael [Fri, 25 Mar 2011 05:43:55 +0000 (22:43 -0700)]
Raphael [Fri, 25 Mar 2011 05:39:23 +0000 (22:39 -0700)]
am
57c70196: (-s ours) Merge "Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: \'Build SDK repository\'. Do not merge."
* commit '
57c7019693a07c7b9e200d4560a0886d248bfe5b':
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
Raphael [Fri, 25 Mar 2011 05:23:24 +0000 (22:23 -0700)]
Merge "Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge."
Brett Chabot [Fri, 25 Mar 2011 02:35:08 +0000 (19:35 -0700)]
am
775c2912: Merge "Add more sdk lib tests to sdk build."
* commit '
775c291292716095ce7610a050e459e7b8d4d4d6':
Add more sdk lib tests to sdk build.
Brett Chabot [Fri, 25 Mar 2011 01:57:29 +0000 (18:57 -0700)]
Merge "Add more sdk lib tests to sdk build."
Raphael [Wed, 16 Feb 2011 00:09:36 +0000 (16:09 -0800)]
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: '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
Raphael [Wed, 16 Feb 2011 00:09:36 +0000 (16:09 -0800)]
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: '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
Ying Wang [Thu, 24 Mar 2011 10:36:19 +0000 (03:36 -0700)]
am
7bbea4b5: Disable dexpreopt for unbundled build.
* commit '
7bbea4b5c1f053cbe428025e9f9dec0e50bcc551':
Disable dexpreopt for unbundled build.
Ying Wang [Thu, 24 Mar 2011 10:36:11 +0000 (03:36 -0700)]
am
3fd580d4: Fix dependency of prebuilt target non-static Java libraries.
* commit '
3fd580d4e29657b812d3ab3c459487689a5f2da6':
Fix dependency of prebuilt target non-static Java libraries.
Brett Chabot [Thu, 24 Mar 2011 05:23:27 +0000 (22:23 -0700)]
Add more sdk lib tests to sdk build.
Also fix whitespace issues introduced by last commit.
Change-Id: I579abcd5f8bc743ee7fa0206307af9347e7352dc
Brett Chabot [Thu, 24 Mar 2011 03:00:31 +0000 (20:00 -0700)]
am
327d133f: Merge "Add ddmlib-tests.jar to sdk build."
* commit '
327d133fce8928f1474c52a07447679e1e76ffa0':
Add ddmlib-tests.jar to sdk build.
Brett Chabot [Thu, 24 Mar 2011 02:22:25 +0000 (19:22 -0700)]
Merge "Add ddmlib-tests.jar to sdk build."
Ying Wang [Wed, 12 Jan 2011 19:12:06 +0000 (11:12 -0800)]
Disable dexpreopt for unbundled build.
Cherry-picked from Honeycomb.
Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885
Ying Wang [Tue, 1 Feb 2011 20:57:45 +0000 (12:57 -0800)]
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
David 'Digit' Turner [Wed, 23 Mar 2011 18:07:51 +0000 (11:07 -0700)]
am
9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
* commit '
9fe6dc2c17ba6113ff4031feaeea7dac0ba5d5a3':
Support target-specific sdk/build/tools.atree extension.
David 'Digit' Turner [Wed, 23 Mar 2011 17:35:13 +0000 (10:35 -0700)]
Merge "Support target-specific sdk/build/tools.atree extension."
David 'Digit' Turner [Wed, 23 Mar 2011 10:20:14 +0000 (11:20 +0100)]
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
Brett Chabot [Wed, 23 Mar 2011 03:38:57 +0000 (20:38 -0700)]
Add ddmlib-tests.jar to sdk build.
Change-Id: Ifc7cc59726066f869504a338d3025bffdeaa6785
David Turner [Tue, 22 Mar 2011 13:03:40 +0000 (06:03 -0700)]
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
David Turner [Tue, 22 Mar 2011 12:50:56 +0000 (05:50 -0700)]
Merge changes I00c75f37,I1fc3cb49
* changes:
x86: the -mbionic flag is needed for IA builds.
x86: qemu emulator is the default build target
David Turner [Tue, 22 Mar 2011 01:09:49 +0000 (18:09 -0700)]
am
75724826: Merge "sdk: Add pc-bios files for IA qemu emulator"
* commit '
757248269bfbe2390a2d04e1d69fb5a0742f3025':
sdk: Add pc-bios files for IA qemu emulator
David Turner [Mon, 21 Mar 2011 22:23:17 +0000 (15:23 -0700)]
Merge "sdk: Add pc-bios files for IA qemu emulator"
Ying Wang [Wed, 16 Mar 2011 01:21:20 +0000 (18:21 -0700)]
am
080ed92e: Merge "Close inherited PIPE before doing work" into gingerbread
* commit '
080ed92e77fc7c24ca3bac1a1dc06057390bfdb8':
Close inherited PIPE before doing work
Ying Wang [Wed, 16 Mar 2011 00:49:04 +0000 (17:49 -0700)]
Merge "Close inherited PIPE before doing work" into gingerbread
Bruce Beare [Tue, 1 Feb 2011 16:00:09 +0000 (08:00 -0800)]
x86: the -mbionic flag is needed for IA builds.
Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Wed, 2 Mar 2011 16:29:59 +0000 (08:29 -0800)]
sdk: Add pc-bios files for IA qemu emulator
Change-Id: Ia919ff57295cd020810989f241da713210bc8720
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>