OSDN Git Service
David 'Digit' Turner [Wed, 30 Mar 2011 16:40:55 +0000 (09:40 -0700)]
am
dc620647: am
c09cc904: am
dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."
* commit '
dc620647ef6c22b55b6de4992104f44c5f1c406c':
build speedup: Do not use shell 'find' function to look for NOTICE files.
Raphael [Wed, 30 Mar 2011 15:19:36 +0000 (08:19 -0700)]
am
a5b8a040: (-s ours) am
f0f1490d: am
57c70196: (-s ours) Merge "Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: \'Build SDK repository\'. Do not merge."
* commit '
a5b8a040867edb54a3512579750dca0dd9898500':
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
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."
Raphael [Tue, 29 Mar 2011 22:57:29 +0000 (15:57 -0700)]
resolved conflicts for merge of
f761d642 to honeycomb-plus-aosp
Change-Id: Id0096682cbabd0d34f5d6b0a0151577d9140ea7d
Ying Wang [Tue, 29 Mar 2011 20:18:25 +0000 (13:18 -0700)]
am
7c7fbeaf: am
7bbea4b5: Disable dexpreopt for unbundled build.
* commit '
7c7fbeaf1a034c9cdc4c7c86eb84cf183a1b6728':
Disable dexpreopt for unbundled build.
Ying Wang [Tue, 29 Mar 2011 20:18:22 +0000 (13:18 -0700)]
am
bef90c0e: am
3fd580d4: Fix dependency of prebuilt target non-static Java libraries.
* commit '
bef90c0ec0fa638e5d2ef0a721e3b3c5e3d9d7f1':
Fix dependency of prebuilt target non-static Java libraries.
Raphael [Tue, 29 Mar 2011 20:07:51 +0000 (13:07 -0700)]
Merge "resolved conflicts for merge of
8c2d872a to honeycomb-plus-aosp" into honeycomb-plus-aosp
Ying Wang [Tue, 29 Mar 2011 19:56:03 +0000 (12:56 -0700)]
am
fcf00d53: Support to build renderscript in unbundled apps.
* commit '
fcf00d53bfdfa18fab0873be2d4d2800c621f861':
Support to build renderscript in unbundled apps.
Raphael [Tue, 29 Mar 2011 19:53:33 +0000 (12:53 -0700)]
resolved conflicts for merge of
8c2d872a to honeycomb-plus-aosp
Change-Id: Ied7d5ccb947094ea7f3334ee052eed39ee315a48
Ying Wang [Tue, 29 Mar 2011 18:47:12 +0000 (11:47 -0700)]
Support to build renderscript in unbundled apps.
Change-Id: I8104be723f507df4f9673616bada11fb613651b7
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
David 'Digit' Turner [Tue, 29 Mar 2011 00:41:22 +0000 (17:41 -0700)]
am
440d7e1e: am
9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
* commit '
440d7e1e5bb732ff8638af40e112e1df98e1f537':
Support target-specific sdk/build/tools.atree extension.
Raphael [Fri, 25 Mar 2011 22:13:55 +0000 (15:13 -0700)]
resolved conflicts for merge of
db0d59d1 to honeycomb-plus-aosp
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
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 02:05:35 +0000 (19:05 -0700)]
am
50a06fe3: am
dd8edfdb: Manual cherry pick of build more sdklib tests.
* commit '
50a06fe30e17acdb9a20c3c58f869d59d8c1b563':
Manual cherry pick of build more sdklib tests.
Brett Chabot [Fri, 25 Mar 2011 02:02:44 +0000 (19:02 -0700)]
am
dd8edfdb: Manual cherry pick of build more sdklib tests.
* commit '
dd8edfdb1ebdc5717357564fe42586d090e2bbe0':
Manual cherry pick of build more sdklib tests.
Brett Chabot [Fri, 25 Mar 2011 01:57:29 +0000 (18:57 -0700)]
Merge "Add more sdk lib tests to sdk build."
Brett Chabot [Thu, 24 Mar 2011 05:23:27 +0000 (22:23 -0700)]
Manual cherry pick of build more sdklib tests.
Original description from open master:
-----------
Add more sdk lib tests to sdk build.
Also fix whitespace issues introduced by last commit.
Change-Id: Ifdede823b99b210ad6a48513e8522b4f660537cf
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
Raphael Moll [Thu, 24 Mar 2011 17:22:53 +0000 (10:22 -0700)]
Raphael Moll [Thu, 24 Mar 2011 17:04:06 +0000 (10:04 -0700)]
Raphael Moll [Thu, 24 Mar 2011 16:54:38 +0000 (09:54 -0700)]
Merge "Merge
960ad4e0952da55943591098ea74827de921d303 from master_open." into honeycomb
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 05:21:04 +0000 (22:21 -0700)]
am
deab07f3: am
d42aadb1: Add ddmlib-tests.jar to sdk build.
* commit '
deab07f31b673481ef92c6044835b579be5e2483':
Add ddmlib-tests.jar to sdk build.
Brett Chabot [Thu, 24 Mar 2011 05:18:26 +0000 (22:18 -0700)]
am
d42aadb1: Add ddmlib-tests.jar to sdk build.
* commit '
d42aadb1ebbc1aef1551b4aa4c525ef54cd5433d':
Add 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: Ib681389a1f1e2ead30808cef3c74dd5da9dea4d0
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."
Bruce Beare [Wed, 2 Mar 2011 16:29:59 +0000 (08:29 -0800)]
Merge
960ad4e0952da55943591098ea74827de921d303 from master_open.
Original commit msg:
sdk: Add pc-bios files for IA qemu emulator
Change-Id: I7f66a192975dc201a5f886e6a5e02b0ca9fbdee0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
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
David Turner [Wed, 23 Mar 2011 21:05:58 +0000 (14:05 -0700)]
am
86ed1dba: am
75724826: Merge "sdk: Add pc-bios files for IA qemu emulator"
* commit '
86ed1dbaa74e1c5b21f98dbb74f2b600a9025470':
sdk: Add pc-bios files for IA qemu emulator
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"
Jean-Michel Trivi [Thu, 17 Mar 2011 03:37:37 +0000 (20:37 -0700)]
am
4361552b: Merge "Fix bug
4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs" into honeycomb-mr1
* commit '
4361552b218871fd61bc7d1f5fe50522da2c399e':
Fix bug
4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs
Jean-Michel Trivi [Thu, 17 Mar 2011 03:34:31 +0000 (20:34 -0700)]
Merge "Fix bug
4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs" into honeycomb-mr1
Jean-Michel Trivi [Thu, 17 Mar 2011 00:30:22 +0000 (17:30 -0700)]
Fix bug
4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs
Add the new libraries on the system
Change-Id: Ifc7259c45dfb7a4e584a822793811f4119ed5535
Doug Zongker [Wed, 16 Mar 2011 18:17:24 +0000 (11:17 -0700)]
am
5d4808db: put extra recovery keys in the product definition
* commit '
5d4808db1630048f6eb0610b75af01c9fc877412':
put extra recovery keys in the product definition
Doug Zongker [Wed, 16 Mar 2011 14:49:13 +0000 (07:49 -0700)]
put extra recovery keys in the product definition
Change-Id: I71637cd578b24891c10171aa59406848649be703
Ying Wang [Wed, 16 Mar 2011 01:30:29 +0000 (18:30 -0700)]
am
eb68729b: am
080ed92e: Merge "Close inherited PIPE before doing work" into gingerbread
* commit '
eb68729bf3e4080119fb06ffce6a79a9fcee1f32':
Close inherited PIPE before doing work
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
Xavier Ducrohet [Tue, 15 Mar 2011 20:50:56 +0000 (13:50 -0700)]
am
4216a8c9: Add the host notice file to the SDK platform-tools folder.
* commit '
4216a8c94e320b7025acd6bf99bac4f9ae45c5c7':
Add the host notice file to the SDK platform-tools folder.
Xavier Ducrohet [Tue, 15 Mar 2011 20:28:40 +0000 (13:28 -0700)]
Add the host notice file to the SDK platform-tools folder.
Change-Id: Id9e789fed635c6e5b43254f8ef6ec353302ca1be
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>
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>
David 'Digit' Turner [Tue, 15 Mar 2011 11:09:34 +0000 (04:09 -0700)]
am
e9b1d0ee: am
f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
* commit '
e9b1d0eee715895f156c8e2601d5b1996919da6d':
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
David 'Digit' Turner [Tue, 15 Mar 2011 10:31:19 +0000 (03:31 -0700)]
Merge "Allow 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
Raphael Moll [Sat, 12 Mar 2011 00:05:53 +0000 (16:05 -0800)]
am
8755e2b2: am
e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
* commit '
8755e2b2c21dd54063fcb62c26c4a2d3575610cf':
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.
Raphael Moll [Thu, 10 Mar 2011 20:29:20 +0000 (12:29 -0800)]
Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
Dianne Hackborn [Thu, 10 Mar 2011 02:31:37 +0000 (18:31 -0800)]
am
59daa2bc: It\'s a new version!
* commit '
59daa2bc61ff0992f792a50dd413dcedd6359cf4':
It's a new version!
Dianne Hackborn [Thu, 10 Mar 2011 02:19:56 +0000 (18:19 -0800)]
It's a new version!
Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
Ying Wang [Thu, 10 Mar 2011 01:02:35 +0000 (17:02 -0800)]
resolved conflicts for merge of
123995f9 to honeycomb-plus-aosp
Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
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.
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
Ed Heyl [Tue, 8 Mar 2011 22:28:26 +0000 (14:28 -0800)]
am
f50b9c4c: resolved conflicts for merge of
24297cab to gingerbread-plus-aosp
* commit '
f50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1':
version bump for new release (please don't merge)
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
Ying Wang [Tue, 8 Mar 2011 00:13:32 +0000 (16:13 -0800)]
Dist build.prop in sdk builds.
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
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
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
David Turner [Mon, 7 Mar 2011 21:45:59 +0000 (13:45 -0800)]
am
b9c627c6: am
0683a773: Merge "x86: Use GCC 4.4.3"
* commit '
b9c627c6a0c6f0af57d0912175bfc739b0eb6249':
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
Ying Wang [Mon, 7 Mar 2011 19:10:07 +0000 (11:10 -0800)]
am
58222219: am
9238d44c: Only copy once even if the first matched src:dest pair appears more than once.
* commit '
582222190f8168bdedf6cfeb986f7e4201f6540a':
Only copy once even if the first matched src:dest pair appears more than once.
Ying Wang [Mon, 7 Mar 2011 19:07:12 +0000 (11:07 -0800)]
resolved conflicts for merge of
0a1f3236 to honeycomb-plus-aosp
Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d
Scott Main [Mon, 7 Mar 2011 18:55:01 +0000 (10:55 -0800)]
am
73b09799: am
e8f40264: Merge "docs: update android market icon" into honeycomb
* commit '
73b0979941a87f5b0bb079b3960038df5db214cb':
docs: update android market icon
Scott Main [Mon, 7 Mar 2011 18:51:43 +0000 (10:51 -0800)]
am
e8f40264: Merge "docs: update android market icon" into honeycomb
* commit '
e8f402640b278b234594fd68dc5bab4ac94a334e':
docs: update android market icon
Scott Main [Mon, 7 Mar 2011 18:44:54 +0000 (10:44 -0800)]
Merge "docs: update android market icon" into honeycomb
Ed Heyl [Sat, 5 Mar 2011 17:31:29 +0000 (09:31 -0800)]
resolved conflicts for merge of
51de6437 to honeycomb-plus-aosp
Change-Id: Ie076ccd04fc02fdc6753b4787bcf5ac12f167d4e
Scott Main [Sat, 5 Mar 2011 17:27:30 +0000 (09:27 -0800)]
am
2e426cf0: am
3ab162e7: docs: script update to account for double-nested list items when scrolling sidenav into view
* commit '
2e426cf07ce61c00acdb477c6c049b0c1f92f082':
docs: script update to account for double-nested list items when scrolling sidenav into view
Scott Main [Sat, 5 Mar 2011 17:24:41 +0000 (09:24 -0800)]
am
3ab162e7: docs: script update to account for double-nested list items when scrolling sidenav into view
* commit '
3ab162e71cbe88ec4d2207c39b9f3d2d7f4c965c':
docs: script update to account for double-nested list items when scrolling sidenav into view
David Turner [Sat, 5 Mar 2011 17:20:33 +0000 (09:20 -0800)]
am
dfa82c43: am
faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
* commit '
dfa82c438f5557c5bae3b8f8ae2dc8444edc8036':
x86: Add in the VirtualBox emulator as a separate build target
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.
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.
David Turner [Sat, 5 Mar 2011 00:39:26 +0000 (16:39 -0800)]
Merge "x86: Use GCC 4.4.3"
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
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.
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
David Turner [Fri, 4 Mar 2011 20:25:47 +0000 (12:25 -0800)]
Merge "x86: sdk_x86 build target"
Scott Main [Fri, 4 Mar 2011 20:23:00 +0000 (12:23 -0800)]
docs: script update to account for double-nested list items when scrolling sidenav into view
Change-Id: I03668f9ecb7da03a7921a0d7eacd2dcaa0a1ba54
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
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"
Ying Wang [Fri, 4 Mar 2011 19:28:01 +0000 (11:28 -0800)]
Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist." into honeycomb-mr1
Ying Wang [Fri, 4 Mar 2011 19:21:38 +0000 (11:21 -0800)]
Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: I3d49d5a2d0e1b6bf26a0e1df0df2d6d7e026f85a
OSDN Git Service
