picopc-android-gingerbread:build.git
10 years ago[picopc] Added ethernet sources to the build system minibox-picopc-gingerbread
Nicu Pavel [Mon, 20 Jun 2011 11:07:21 +0000 (14:07 +0300)]
[picopc] Added ethernet sources to the build system

Change-Id: I28bcc75cbb0c2d7906dad46cad902b2dadb22416

11 years ago[picopc] Compilation tunning for pico-SAM9G45
Nicu Pavel [Thu, 3 Mar 2011 08:23:05 +0000 (10:23 +0200)]
[picopc] Compilation tunning for pico-SAM9G45

Change-Id: I3dc2d1b14016f47590c04d023b8a2732070be995

11 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

11 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.

11 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"

11 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."

11 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.

11 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

11 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."

11 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"

11 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

11 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

11 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"

11 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""

11 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

11 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

11 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.

11 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."

11 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

11 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>
11 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

11 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

11 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

11 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

11 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

11 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"

11 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"

11 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>
11 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.

11 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.

11 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."

11 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

11 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.

11 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.

11 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."

11 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.

11 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."

11 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

11 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

11 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.

11 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.

11 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

11 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.

11 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."

11 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

11 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

11 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.

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

11 years agoSupport 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

11 years agoAdd ddmlib-tests.jar to sdk build.
Brett Chabot [Wed, 23 Mar 2011 03:38:57 +0000 (20:38 -0700)]
Add ddmlib-tests.jar to sdk build.

Change-Id: Ifc7cc59726066f869504a338d3025bffdeaa6785

11 years agoam b1047a99: Merge changes I00c75f37,I1fc3cb49
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

11 years agoMerge changes I00c75f37,I1fc3cb49
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

11 years agoam 75724826: Merge "sdk: Add pc-bios files for IA qemu emulator"
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

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

11 years agoam 080ed92e: Merge "Close inherited PIPE before doing work" into gingerbread
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

11 years agoMerge "Close inherited PIPE before doing work" into gingerbread
Ying Wang [Wed, 16 Mar 2011 00:49:04 +0000 (17:49 -0700)]
Merge "Close inherited PIPE before doing work" into gingerbread

11 years agox86: the -mbionic flag is needed for IA builds.
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>
11 years agosdk: Add pc-bios files for IA qemu emulator
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>
11 years agox86: qemu emulator is the default build target
Bruce Beare [Fri, 18 Feb 2011 23:06:20 +0000 (15:06 -0800)]
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>
11 years agoam f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
David 'Digit' Turner [Tue, 15 Mar 2011 10:59:52 +0000 (03:59 -0700)]
am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"

* commit 'f8f95fc8b1a1eb19812fc55b230da3bfbe5272e5':
  Allow win_sdk build with USE_CCACHE=1

11 years agoMerge "Allow win_sdk build with USE_CCACHE=1"
David 'Digit' Turner [Tue, 15 Mar 2011 10:31:19 +0000 (03:31 -0700)]
Merge "Allow win_sdk build with USE_CCACHE=1"

11 years agoAllow win_sdk build with USE_CCACHE=1
David 'Digit' Turner [Sat, 12 Mar 2011 12:19:01 +0000 (13:19 +0100)]
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

11 years agoUse my-dir in a consistent way as others
Chih-Wei Huang [Sun, 16 Jan 2011 10:31:29 +0000 (18:31 +0800)]
Use my-dir in a consistent way as others

Change-Id: I3fd0cc58b48d621b431d7dd05fb689c1917b530d

11 years agoam e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
Raphael Moll [Thu, 10 Mar 2011 20:46:12 +0000 (12:46 -0800)]
am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."

* commit 'e84739e942d19955248e1fc1ce966d56543eaf0e':
  Fix find-jdk-tools-jar to be cygwin-friendly.

11 years agoMerge "Fix find-jdk-tools-jar to be cygwin-friendly."
Raphael Moll [Thu, 10 Mar 2011 20:29:20 +0000 (12:29 -0800)]
Merge "Fix find-jdk-tools-jar to be cygwin-friendly."

11 years agoam be188caf: Dist build.prop in sdk builds.
Ying Wang [Thu, 10 Mar 2011 00:47:27 +0000 (16:47 -0800)]
am be188caf: Dist build.prop in sdk builds.

* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
  Dist build.prop in sdk builds.

11 years agoFix find-jdk-tools-jar to be cygwin-friendly.
Raphael Moll [Tue, 8 Mar 2011 22:29:25 +0000 (14:29 -0800)]
Fix find-jdk-tools-jar to be cygwin-friendly.

Change-Id: I9cf2035026725fd1ba8a014b484262ed1acc1df4

11 years agoresolved conflicts for merge of 24297cab to gingerbread-plus-aosp
Ed Heyl [Tue, 8 Mar 2011 22:12:25 +0000 (14:12 -0800)]
resolved conflicts for merge of 24297cab to gingerbread-plus-aosp

Change-Id: Ia10a4601b7156f6379d1663d811af45103ff81ff

11 years agoDist build.prop in sdk builds.
Ying Wang [Tue, 8 Mar 2011 00:13:32 +0000 (16:13 -0800)]
Dist build.prop in sdk builds.

Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d

11 years agoMerge "version bump for new release (please don't merge)" into gingerbread
Ed Heyl [Tue, 8 Mar 2011 20:35:20 +0000 (12:35 -0800)]
Merge "version bump for new release   (please don't merge)" into gingerbread

11 years agoversion bump for new release (please don't merge)
Ed Heyl [Tue, 8 Mar 2011 02:05:40 +0000 (18:05 -0800)]
version bump for new release   (please don't merge)

Change-Id: I94081a1288da434811a1ddaa8a7b7b5da13d9341

11 years agoam 0683a773: Merge "x86: Use GCC 4.4.3"
David Turner [Mon, 7 Mar 2011 21:35:02 +0000 (13:35 -0800)]
am 0683a773: Merge "x86: Use GCC 4.4.3"

* commit '0683a77348f2a0a529a8e2bcfdf4b6dc6b4c5f5b':
  x86: Use GCC 4.4.3

11 years agoam 9238d44c: Only copy once even if the first matched src:dest pair appears more...
Ying Wang [Sat, 5 Mar 2011 01:13:08 +0000 (17:13 -0800)]
am 9238d44c: Only copy once even if the first matched src:dest pair appears more than once.

* commit '9238d44c92b355bac6b7a13b23f298336338bf3d':
  Only copy once even if the first matched src:dest pair appears more than once.

11 years agoam a73b6561: Drop support for target files with no recovery.fstab.
Ying Wang [Sat, 5 Mar 2011 01:13:04 +0000 (17:13 -0800)]
am a73b6561: Drop support for target files with no recovery.fstab.

* commit 'a73b6561cee39ad416f4af327dbe72ec565d2423':
  Drop support for target files with no recovery.fstab.

11 years agoMerge "x86: Use GCC 4.4.3"
David Turner [Sat, 5 Mar 2011 00:39:26 +0000 (16:39 -0800)]
Merge "x86: Use GCC 4.4.3"

11 years agoOnly copy once even if the first matched src:dest pair appears more than once.
Ying Wang [Wed, 3 Nov 2010 04:31:47 +0000 (21:31 -0700)]
Only copy once even if the first matched src:dest pair appears more than once.

Change-Id: I476923007dac1174371d6e6526d72182eb6c7243

11 years agoDrop support for target files with no recovery.fstab.
Ying Wang [Fri, 4 Mar 2011 05:52:08 +0000 (21:52 -0800)]
Drop support for target files with no recovery.fstab.

Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.

11 years agoam 9edd4fa0: Merge "x86: sdk_x86 build target"
David Turner [Fri, 4 Mar 2011 20:39:52 +0000 (12:39 -0800)]
am 9edd4fa0: Merge "x86: sdk_x86 build target"

* commit '9edd4fa0a629e178382bacf11bd8875ae826d651':
  x86: sdk_x86 build target

11 years agoMerge "x86: sdk_x86 build target"
David Turner [Fri, 4 Mar 2011 20:25:47 +0000 (12:25 -0800)]
Merge "x86: sdk_x86 build target"

11 years agoam faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
David Turner [Fri, 4 Mar 2011 19:46:14 +0000 (11:46 -0800)]
am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"

* commit 'faa68200661eea15f5b3962386d325609e1f90a8':
  x86: Add in the VirtualBox emulator as a separate build target

11 years agoMerge "x86: Add in the VirtualBox emulator as a separate build target"
David Turner [Fri, 4 Mar 2011 19:41:02 +0000 (11:41 -0800)]
Merge "x86: Add in the VirtualBox emulator as a separate build target"

11 years agoam 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
Wink Saville [Tue, 1 Mar 2011 21:16:09 +0000 (13:16 -0800)]
am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"

* commit '4d67e91644ea78b5209de50355ba812a73b519f8':
  WAPPushManager, WAP Push over SMS message handler

11 years agox86: Use GCC 4.4.3
Bruce Beare [Thu, 27 Jan 2011 02:43:15 +0000 (18:43 -0800)]
x86: Use GCC 4.4.3

Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767
Author:    H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
11 years agox86: sdk_x86 build target
Bruce Beare [Fri, 18 Feb 2011 23:09:35 +0000 (15:09 -0800)]
x86: sdk_x86 build target

Change-Id: I3876246ddf884ffd09ff0f8e3e300dffb4a332f0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
11 years agox86: Add in the VirtualBox emulator as a separate build target
Bruce Beare [Wed, 16 Feb 2011 00:46:08 +0000 (16:46 -0800)]
x86: Add in the VirtualBox emulator as a separate build target

Change-Id: Icff81a757952b7652d171bc95773e177c4fd7772
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
11 years agoam d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
Wink Saville [Tue, 1 Mar 2011 20:39:42 +0000 (12:39 -0800)]
am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"

* commit 'd09b2e552788cc90813e930e3912651e053c657c':
  WAPPushManager, WAP Push over SMS message handler

11 years agoMerge "WAPPushManager, WAP Push over SMS message handler"
Wink Saville [Thu, 24 Feb 2011 02:23:21 +0000 (18:23 -0800)]
Merge "WAPPushManager, WAP Push over SMS message handler"

11 years agoam a34fa95c: force inclusion of system log tags in the event-log-tags file
Doug Zongker [Wed, 23 Feb 2011 21:25:45 +0000 (13:25 -0800)]
am a34fa95c: force inclusion of system log tags in the event-log-tags file

* commit 'a34fa95c164a9388ed0b84b17a63241bffd4132a':
  force inclusion of system log tags in the event-log-tags file

11 years agoforce inclusion of system log tags in the event-log-tags file
Doug Zongker [Wed, 23 Feb 2011 20:17:29 +0000 (12:17 -0800)]
force inclusion of system log tags in the event-log-tags file

Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3

11 years agoam 951a3e5f: Merge "Build system tweaks for Valgrind."
Kenny Root [Thu, 17 Feb 2011 19:38:51 +0000 (11:38 -0800)]
am 951a3e5f: Merge "Build system tweaks for Valgrind."

* commit '951a3e5f416d9ebe84e922132c85c8696d5d74a0':
  Build system tweaks for Valgrind.

11 years agoMerge "Build system tweaks for Valgrind."
Kenny Root [Wed, 16 Feb 2011 23:27:16 +0000 (15:27 -0800)]
Merge "Build system tweaks for Valgrind."

11 years agoBuild system tweaks for Valgrind.
Jeff Brown [Wed, 16 Feb 2011 22:42:40 +0000 (14:42 -0800)]
Build system tweaks for Valgrind.

Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.

Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused.  (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)

Change-Id: Ifed4ffe17003d90370c711ea6606e2b75e841dee

11 years agoam 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."
David 'Digit' Turner [Tue, 15 Feb 2011 18:10:45 +0000 (10:10 -0800)]
am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."

* commit '86a903647f3f3df4484396ec58ba5b0454abd36e':
  core/binary.mk: Add missing Objective-C objects to the build.

11 years agoMerge "core/binary.mk: Add missing Objective-C objects to the build."
David 'Digit' Turner [Mon, 14 Feb 2011 23:07:00 +0000 (15:07 -0800)]
Merge "core/binary.mk: Add missing Objective-C objects to the build."

11 years agocore/binary.mk: Add missing Objective-C objects to the build.
David 'Digit' Turner [Fri, 11 Feb 2011 15:19:31 +0000 (16:19 +0100)]
core/binary.mk: Add missing Objective-C objects to the build.

For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).

+ Fix a typo in transform-host-m-to-o definition.

This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.

Change-Id: I173811cf11cdb5b045073aade59364236145bc77

11 years agoam 8f9849a0: Merge "no-op"
Jean-Baptiste Queru [Thu, 10 Feb 2011 21:22:01 +0000 (13:22 -0800)]
am 8f9849a0: Merge "no-op"

* commit '8f9849a037c901ea3b1e7a1d7d43f56728abea40':
  no-op

11 years agoMerge "no-op"
Jean-Baptiste Queru [Thu, 10 Feb 2011 20:58:01 +0000 (12:58 -0800)]
Merge "no-op"

11 years agono-op
Jean-Baptiste Queru [Thu, 10 Feb 2011 20:57:31 +0000 (12:57 -0800)]
no-op

Change-Id: Ifd90e66fe63d429f9998a36f72553e2aacf3fc7c

11 years agoam 886e5aa7: Merge "fix api level filtering script to compare integers, not strings...
Scott Main [Fri, 4 Feb 2011 23:14:57 +0000 (15:14 -0800)]
am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread

* commit '886e5aa742c1667de3ca5b628bf6865948ef4513':
  fix api level filtering script to compare integers, not strings

11 years agoMerge "fix api level filtering script to compare integers, not strings" into gingerbread
Scott Main [Fri, 4 Feb 2011 23:11:59 +0000 (15:11 -0800)]
Merge "fix api level filtering script to compare integers, not strings" into gingerbread