OSDN Git Service

android-x86/build.git
13 years agoam f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:23:21 +0000 (12:23 -0700)]
am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."

* commit 'f3659c8b0a1cf60d5bcd28d8a1c0e39716f4060f':
  Relax the constraint of 64bit build environment.

13 years agoam c5e5d989: am 9d7590b9: Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:21:37 +0000 (12:21 -0700)]
am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"

* commit 'c5e5d9897f6fc18123a8f5d15a90152019979a22':
  Tweak prelink map

13 years agoam 36c1f10d: Merge "Relax the constraint of 64bit build environment."
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.

13 years agoam 9d7590b9: Merge "Tweak prelink map"
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

13 years agoMerge "Relax the constraint of 64bit build environment."
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:19:14 +0000 (11:19 -0700)]
Merge "Relax the constraint of 64bit build environment."

13 years agoRelax 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

13 years agoMerge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:15:36 +0000 (11:15 -0700)]
Merge "Tweak prelink map"

13 years agoTweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:15:00 +0000 (11:15 -0700)]
Tweak prelink map

Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2

13 years agoam ee803184: am f771489d: Merge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:04:31 +0000 (08:04 -0700)]
am ee803184: am f771489d: Merge "Tweak prelink map, more"

* commit 'ee8031843e4dc3e9ff60c1acdc516121145fece1':
  Tweak prelink map, more

13 years agoam f771489d: Merge "Tweak prelink map, more"
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

13 years agoMerge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:43:02 +0000 (07:43 -0700)]
Merge "Tweak prelink map, more"

13 years agoTweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:33:52 +0000 (07:33 -0700)]
Tweak prelink map, more

Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7

13 years agoam 9bd85361: am 15ced7e1: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:25:43 +0000 (20:25 -0700)]
am 9bd85361: am 15ced7e1: Merge prelink map tweaks

* commit '9bd853612a45753512b3dab27f247adb46e7a3c8':
  Tweak prelink map

13 years agoam 15ced7e1: Merge prelink map tweaks
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

13 years agoMerge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:17:28 +0000 (20:17 -0700)]
Merge prelink map tweaks

Change-Id: I86f101e250e53beb197f9ea46e7dfb7e44f20063

13 years agoTweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map

Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25

13 years agoam 69ae44e2: am fd64de9a: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:58:18 +0000 (18:58 -0700)]
am 69ae44e2: am fd64de9a: Merge prelink map tweaks

* commit '69ae44e284b1735928b8db53bf2e0690768e2d1b':
  Tweak prelink map

13 years agoam fd64de9a: Merge prelink map tweaks
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

13 years agoMerge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:37:07 +0000 (18:37 -0700)]
Merge prelink map tweaks

Change-Id: I11895037a7c5768f48f18b63274daaa4d25bc681

13 years agoTweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map

Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25

13 years agoam 40dc95be: am 14273125: Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:32:11 +0000 (17:32 -0700)]
am 40dc95be: am 14273125: Merge "Tweak prelink map"

* commit '40dc95be7744871b5363ae2e21a14343cd666b0f':
  Tweak prelink map

13 years agoam 14273125: Merge "Tweak prelink map"
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

13 years agoMerge "Tweak prelink map"
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:31:58 +0000 (16:31 -0700)]
Merge "Tweak prelink map"

13 years agoTweak prelink map
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:17:42 +0000 (16:17 -0700)]
Tweak prelink map

Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1

13 years agoMerge 742968bd
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:06:55 +0000 (14:06 -0700)]
Merge 742968bd

Change-Id: I90a9f487a8b6d9bc96dedbe9f1e978e439be8cd3

13 years agoAdding a cleanspec to pick up version change. Do not merge.
Dan Morrill [Thu, 16 Jun 2011 20:43:50 +0000 (13:43 -0700)]
Adding a cleanspec to pick up version change. Do not merge.

Change-Id: I4853ae86488164400d7a0203614b9e87515f6e61

13 years agoam eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
Ed Heyl [Thu, 16 Jun 2011 20:17:08 +0000 (13:17 -0700)]
am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread

* commit 'eb27aa01c87ed774cf5d71ce1c92d87575a08ad7':
  add ANDROID_HOST_OUT to env (please do not merge)

13 years agoMerge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
Ed Heyl [Thu, 16 Jun 2011 20:08:09 +0000 (13:08 -0700)]
Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread

13 years agoam 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"
Jean-Baptiste Queru [Thu, 16 Jun 2011 19:57:33 +0000 (12:57 -0700)]
am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '4c90a648cd0e1310d4b934c54905af3cf40b2770':
  Switch back to mksh as the default

13 years agoam 14bf45f3: Merge "Switch back to mksh as the default"
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

13 years agoMerge "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"

13 years agoSwitch 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

13 years agoMerge bb41d06d
Jean-Baptiste Queru [Thu, 16 Jun 2011 14:19:44 +0000 (07:19 -0700)]
Merge bb41d06d

Change-Id: Ieeeec2e835e3e7eb223a5f62927111db24295ccf

13 years agoUpdate version to 2.3.5.
Dan Morrill [Thu, 9 Jun 2011 20:20:55 +0000 (13:20 -0700)]
Update version to 2.3.5.

Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591

13 years agoadd ANDROID_HOST_OUT to env (please do not merge)
Ed Heyl [Tue, 7 Jun 2011 19:02:51 +0000 (12:02 -0700)]
add ANDROID_HOST_OUT to env (please do not merge)

Change-Id: Iddc61e1f93e13a3884b919638da1c24271dd6ca5

13 years agoam 536938e0: am 978f86ea: Merge "Increase the Java heap size for droiddoc"
Jean-Baptiste Queru [Mon, 6 Jun 2011 15:23:09 +0000 (08:23 -0700)]
am 536938e0: am 978f86ea: Merge "Increase the Java heap size for droiddoc"

* commit '536938e01195a2ee279a6652e0b88c50d5f4c2a8':
  Increase the Java heap size for droiddoc

13 years agoam 978f86ea: Merge "Increase the Java heap size for droiddoc"
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

13 years agoMerge "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"

13 years agoam c33e0739: Merge from gingerbread
Jean-Baptiste Queru [Wed, 1 Jun 2011 21:26:18 +0000 (14:26 -0700)]
am c33e0739: Merge from gingerbread

* commit 'c33e07396b4de4453c9212aaeb13c0c36b875589':

13 years agoMerge from gingerbread
Jean-Baptiste Queru [Wed, 1 Jun 2011 21:09:24 +0000 (14:09 -0700)]
Merge from gingerbread

Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689

13 years agoam 3c60c67a: Merge from open-source gingerbread
Jean-Baptiste Queru [Wed, 1 Jun 2011 15:07:56 +0000 (08:07 -0700)]
am 3c60c67a: Merge from open-source gingerbread

* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
  Relax the constraint of 64bit build environment.

13 years agoMerge from open-source gingerbread
Jean-Baptiste Queru [Wed, 1 Jun 2011 14:42:07 +0000 (07:42 -0700)]
Merge from open-source gingerbread

Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b

13 years agoMerge "Relax the constraint of 64bit build environment." into gingerbread
Jean-Baptiste Queru [Tue, 31 May 2011 21:03:21 +0000 (14:03 -0700)]
Merge "Relax the constraint of 64bit build environment." into gingerbread

13 years agoam e2419c89: Support to run dex-preopt on prebuilt apks.
Ying Wang [Fri, 27 May 2011 00:10:37 +0000 (17:10 -0700)]
am e2419c89: Support to run dex-preopt on prebuilt apks.

* commit 'e2419c89cef4eeae1b6cd113ef1c92d397834841':
  Support to run dex-preopt on prebuilt apks.

13 years agoSupport to run dex-preopt on prebuilt apks.
Ying Wang [Thu, 26 May 2011 22:59:56 +0000 (15:59 -0700)]
Support to run dex-preopt on prebuilt apks.

Change-Id: I11450310144cb8d7f127c427ada4a0589e030843

13 years agoMerge "x86: Enable -fstack-protector"
David Turner [Thu, 26 May 2011 16:21:35 +0000 (09:21 -0700)]
Merge "x86: Enable -fstack-protector"

13 years agox86: 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>
13 years agoMerge "Clean up of X86 build flags"
David Turner [Wed, 25 May 2011 05:58:20 +0000 (22:58 -0700)]
Merge "Clean up of X86 build flags"

13 years agoRelax 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: Id8be221dcfa07651a4d9a2776b00e907b4ff750e

13 years agoMerge "Use actual numbers in version numbers."
Jean-Baptiste Queru [Thu, 19 May 2011 20:57:00 +0000 (13:57 -0700)]
Merge "Use actual numbers in version numbers."

13 years agoClean up of X86 build flags
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>

13 years agoMerge "Remove simulator from the lunch menu"
Jean-Baptiste Queru [Thu, 12 May 2011 15:04:50 +0000 (08:04 -0700)]
Merge "Remove simulator from the lunch menu"

13 years agoRemove 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

13 years agoUse actual numbers in version numbers.
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

13 years agoam d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
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

13 years agoam f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
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.

13 years agoMerge "x86: Disable stack-protector until bionic is fixed"
David Turner [Tue, 26 Apr 2011 06:35:09 +0000 (23:35 -0700)]
Merge "x86: Disable stack-protector until bionic is fixed"

13 years agoMerge "full_x86-eng: Ensure we copy the PC bios files."
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."

13 years agoIncrease the Java heap size for droiddoc
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

13 years agoam 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
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.

13 years agoam 531c0c33: Merge "Add swtmenubar.jar to SDK"
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

13 years agoMerge "Allow swtmenubar module to be buildable on Windows."
Raphael Moll [Fri, 15 Apr 2011 21:42:09 +0000 (14:42 -0700)]
Merge "Allow swtmenubar module to be buildable on Windows."

13 years agoMerge "Add swtmenubar.jar to SDK"
Raphael Moll [Fri, 15 Apr 2011 21:42:05 +0000 (14:42 -0700)]
Merge "Add swtmenubar.jar to SDK"

13 years agoAllow swtmenubar module to be buildable on Windows.
Raphael Moll [Fri, 15 Apr 2011 04:19:10 +0000 (21:19 -0700)]
Allow swtmenubar module to be buildable on Windows.

Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b

13 years agoAdd swtmenubar.jar to SDK
Raphael Moll [Thu, 14 Apr 2011 06:49:21 +0000 (23:49 -0700)]
Add swtmenubar.jar to SDK

Change-Id: Ia46337875cb78bb6a01731008b9acbfa4657d0a9

13 years agoam 479ec682: Merge "Fix "argument list too long""
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"

13 years agoMerge "Fix "argument list too long""
Ying Wang [Thu, 14 Apr 2011 17:07:38 +0000 (10:07 -0700)]
Merge "Fix "argument list too long""

13 years agoFix "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

13 years agofull_x86-eng: Ensure we copy the PC bios files.
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

13 years agoam e442c136: Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."
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.

13 years agoMerge "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."

13 years agoAdd 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

13 years agox86: Disable stack-protector until bionic is fixed
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>
13 years agoresolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp
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

13 years agoam a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"
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

13 years agoam f78fb1d1: Merge "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

13 years agoam c5e45492: am 4c401b1a: Merge "Fix argument handling in runhat() function"
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

13 years agoam 4c401b1a: Merge "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

13 years agoMerge "Use my-dir in a consistent way as others"
Ying Wang [Thu, 31 Mar 2011 21:54:56 +0000 (14:54 -0700)]
Merge "Use my-dir in a consistent way as others"

13 years agoMerge "Fix argument handling in runhat() function"
Ying Wang [Thu, 31 Mar 2011 21:54:24 +0000 (14:54 -0700)]
Merge "Fix argument handling in runhat() function"

13 years agoFix 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>
13 years agoam c09cc904: am dffd4058: Merge "build speedup: Do not use shell \'find\' function...
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.

13 years agoam dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for...
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.

13 years agoMerge "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."

13 years agobuild 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

13 years agoam f0f1490d: am 57c70196: (-s ours) Merge "Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b...
Raphael [Fri, 25 Mar 2011 05:43:55 +0000 (22:43 -0700)]
am f0f1490d: am 57c70196: (-s ours) Merge "Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: \'Build SDK repository\'. Do not merge."

* commit 'f0f1490d8bccdb74afb0a59f1a748cc01e8c1502':
  Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.

13 years agoam 57c70196: (-s ours) Merge "Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: \'Build...
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.

13 years agoMerge "Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do...
Raphael [Fri, 25 Mar 2011 05:23:24 +0000 (22:23 -0700)]
Merge "Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge."

13 years agoam 775c2912: Merge "Add more sdk lib tests to sdk build."
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.

13 years agoMerge "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."

13 years agoMerge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
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

13 years agoMerge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
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

13 years agoam 7bbea4b5: Disable dexpreopt for unbundled build.
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.

13 years agoam 3fd580d4: Fix dependency of prebuilt target non-static Java libraries.
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.

13 years agoAdd more sdk lib tests to sdk build.
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

13 years agoam 327d133f: Merge "Add ddmlib-tests.jar to sdk build."
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.

13 years agoMerge "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."

13 years agoDisable dexpreopt for unbundled 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

13 years agoFix dependency of prebuilt target non-static Java libraries.
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

13 years agoam 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
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.