OSDN Git Service
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 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: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: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 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: Id08a3a55a564938dbeb6e3dd170d4a9a7153ae6e
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 02:22:25 +0000 (19:22 -0700)]
Merge "Add ddmlib-tests.jar to sdk build."
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 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 [Mon, 21 Mar 2011 22:23:17 +0000 (15:23 -0700)]
Merge "sdk: Add pc-bios files for IA qemu emulator"
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 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
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
Raphael Moll [Thu, 10 Mar 2011 20:29:20 +0000 (12:29 -0800)]
Merge "Fix 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
David Turner [Sat, 5 Mar 2011 00:39:26 +0000 (16:39 -0800)]
Merge "x86: Use GCC 4.4.3"
David Turner [Fri, 4 Mar 2011 20:25:47 +0000 (12:25 -0800)]
Merge "x86: sdk_x86 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"
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>
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>
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>
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
Wink Saville [Thu, 24 Feb 2011 02:23:21 +0000 (18:23 -0800)]
Merge "WAPPushManager, WAP Push over SMS message handler"
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.
Kenny Root [Wed, 16 Feb 2011 23:27:16 +0000 (15:27 -0800)]
Merge "Build 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
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.
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."
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
Jean-Baptiste Queru [Thu, 10 Feb 2011 21:22:01 +0000 (13:22 -0800)]
Jean-Baptiste Queru [Thu, 10 Feb 2011 20:58:01 +0000 (12:58 -0800)]
Merge "no-op"
Jean-Baptiste Queru [Thu, 10 Feb 2011 20:57:31 +0000 (12:57 -0800)]
no-op
Change-Id: Ifd90e66fe63d429f9998a36f72553e2aacf3fc7c
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
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
Scott Main [Fri, 4 Feb 2011 23:10:33 +0000 (15:10 -0800)]
fix api level filtering script to compare integers, not strings
Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5
Raphael [Fri, 4 Feb 2011 22:49:17 +0000 (14:49 -0800)]
am
843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '
843c6e2530a0783ae1a5a4758cb5e76ad975ae72':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Raphael [Fri, 4 Feb 2011 06:59:27 +0000 (22:59 -0800)]
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Depends on change
8252cdea from development to get the
verbose/quiet flag for mkstub.
Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
Raphael Moll [Thu, 3 Feb 2011 19:42:34 +0000 (11:42 -0800)]
am
a15717c9: am
6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit '
a15717c9905e32f2724645e3734567c40d8d3eb0':
SDK: Enable "make sdk/common" under Windows
Raphael Moll [Thu, 3 Feb 2011 18:54:05 +0000 (10:54 -0800)]
am
6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
* commit '
6b7b53cb36bda3b2aa1de94654cd73785d67c267':
SDK: Enable "make sdk/common" under Windows
Raphael Moll [Thu, 3 Feb 2011 18:45:50 +0000 (10:45 -0800)]
Merge "SDK: Enable "make sdk/common" under Windows"
Raphael [Thu, 3 Feb 2011 17:05:07 +0000 (09:05 -0800)]
am
6b6e8114: am
4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '
6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
SDK: Strip llvm-rs-cc in SDK.
Raphael [Thu, 3 Feb 2011 16:56:22 +0000 (08:56 -0800)]
am
4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '
4167b2bae58b445cfaf15291a7aa6b0ccd025596':
SDK: Strip llvm-rs-cc in SDK.
Raphael Moll [Wed, 2 Feb 2011 23:59:46 +0000 (15:59 -0800)]
SDK: Enable "make sdk/common" under Windows
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
Brian Swetland [Wed, 2 Feb 2011 23:23:20 +0000 (15:23 -0800)]
am
d7798a7e: fix TINY ANDROID yet again...
* commit '
d7798a7e1b3241c49d7c8325cf14ac608350b719':
fix TINY ANDROID yet again...
Brian Swetland [Wed, 2 Feb 2011 23:20:50 +0000 (15:20 -0800)]
fix TINY ANDROID yet again...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
Raphael [Wed, 2 Feb 2011 21:41:13 +0000 (13:41 -0800)]
Merge "SDK: Strip llvm-rs-cc in SDK."
Raphael [Tue, 1 Feb 2011 21:30:00 +0000 (13:30 -0800)]
SDK: Strip llvm-rs-cc in SDK.
SDK Bug:
3394374
Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
Scott Main [Wed, 2 Feb 2011 04:52:23 +0000 (20:52 -0800)]
am
0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '
0fe9974c38e41a2aa386d5744d1a75d8bd26b1bc':
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
Scott Main [Wed, 2 Feb 2011 04:32:18 +0000 (20:32 -0800)]
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3
backport some style changes for notes from master to gb
Change-Id: I4a7c6cfcadade5d90069ecab1edc694cb333430e
Jean-Baptiste Queru [Mon, 31 Jan 2011 23:14:41 +0000 (15:14 -0800)]
Merge from open-source master
Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
Jean-Baptiste Queru [Mon, 31 Jan 2011 21:50:10 +0000 (13:50 -0800)]
am
2d946f7a: Merge "partial build fix"
* commit '
2d946f7ac9a74870271179d5d7a16a5f9ed61641':
partial build fix
Jean-Baptiste Queru [Mon, 31 Jan 2011 21:50:07 +0000 (13:50 -0800)]
am
de50cfb5: Merge "partial build fix"
* commit '
de50cfb5f961a1ad4ceeeec2108147555fea0e22':
partial build fix
Jean-Baptiste Queru [Mon, 31 Jan 2011 21:00:23 +0000 (13:00 -0800)]
Merge "partial build fix"
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:59:54 +0000 (12:59 -0800)]
partial build fix
Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:36:05 +0000 (12:36 -0800)]
Merge "partial build fix"
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:35:02 +0000 (12:35 -0800)]
partial build fix
Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
Jean-Baptiste Queru [Thu, 27 Jan 2011 22:27:32 +0000 (14:27 -0800)]
am
61356271: am
e388ac10: Merge "Extra protobuf-related support"
* commit '
6135627140bd799ee56ba894b69a9455ca0af86a':
Extra protobuf-related support
Jean-Baptiste Queru [Thu, 27 Jan 2011 22:25:30 +0000 (14:25 -0800)]
am
e388ac10: Merge "Extra protobuf-related support"
* commit '
e388ac10b9dfc39f7578b6d222652926265dcffd':
Extra protobuf-related support
Jean-Baptiste Queru [Thu, 27 Jan 2011 22:19:03 +0000 (14:19 -0800)]
Merge "Extra protobuf-related support"
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:57:47 +0000 (13:57 -0800)]
am
ab81ffe2: am
70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
* commit '
ab81ffe2defa3294e09b70372e2179db2377c894':
Add dnsproxyd to keep in sync with base init.rc
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:55:02 +0000 (13:55 -0800)]
am
70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
* commit '
70b8941f19440592938bdb5c453b16be4d1d8c31':
Add dnsproxyd to keep in sync with base init.rc
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:49:30 +0000 (13:49 -0800)]
Extra protobuf-related support
Change-Id: I375d32f0bcb695ccb0603743133034941d584163
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:38:33 +0000 (13:38 -0800)]
Merge "Add dnsproxyd to keep in sync with base init.rc"
Bruce Beare [Thu, 27 Jan 2011 21:16:57 +0000 (13:16 -0800)]
Add dnsproxyd to keep in sync with base init.rc
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:32:03 +0000 (13:32 -0800)]
am
ad3e0072: am
39f358b7: Merge "Protobuf compiler support in the build system"
* commit '
ad3e00724d62e5def2f2552533a62a800e9f3ee9':
Protobuf compiler support in the build system
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:30:31 +0000 (13:30 -0800)]
am
39f358b7: Merge "Protobuf compiler support in the build system"
* commit '
39f358b75f1c6a9a10823bf5e400d1ece0144a05':
Protobuf compiler support in the build system
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:22:36 +0000 (13:22 -0800)]
am
f273723f: am
1e0055fb: Merge "A few more grandfathered user tags"
* commit '
f273723f7710bb127ee1026e05049e4ee5290c8a':
A few more grandfathered user tags
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:16:50 +0000 (13:16 -0800)]
am
1e0055fb: Merge "A few more grandfathered user tags"
* commit '
1e0055fb91f7b8582cb2979c45532ae01bf7a779':
A few more grandfathered user tags
Jean-Baptiste Queru [Thu, 27 Jan 2011 21:12:09 +0000 (13:12 -0800)]
Merge "Protobuf compiler support in the build system"
Jean-Baptiste Queru [Thu, 27 Jan 2011 20:19:43 +0000 (12:19 -0800)]
Protobuf compiler support in the build system
Jean-Baptiste Queru [Thu, 27 Jan 2011 20:17:52 +0000 (12:17 -0800)]
Merge "A few more grandfathered user tags"
Jean-Baptiste Queru [Thu, 27 Jan 2011 20:17:00 +0000 (12:17 -0800)]
A few more grandfathered user tags
Change-Id: I57309b461ec2395da068961f976c904bd3474e88
Jean-Baptiste Queru [Thu, 27 Jan 2011 17:24:43 +0000 (09:24 -0800)]
am
928a0304: re-merge from readonly-korg-master - do not merge
* commit '
928a03043187b7c4843b2c832b589c57b7541e4a':
re-merge from readonly-korg-master - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:26:25 +0000 (08:26 -0800)]
re-merge from readonly-korg-master - do not merge
Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:55:43 +0000 (08:55 -0800)]
am
1fe74722: am
4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"
* commit '
1fe74722b608a66381d186b32b2fb59d254194c7':
Add a few more legacy modules that can have user tags - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:53:44 +0000 (08:53 -0800)]
am
4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"
* commit '
4a91aa9b40d2bffdab04323d100fad3a0e3e6ecc':
Add a few more legacy modules that can have user tags - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:26:25 +0000 (08:26 -0800)]
Merge "Add a few more legacy modules that can have user tags - do not merge"
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:18:41 +0000 (08:18 -0800)]
Add a few more legacy modules that can have user tags - do not merge
Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
Scott Main [Fri, 21 Jan 2011 20:34:06 +0000 (12:34 -0800)]
am
05d14cb9: Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
* commit '
05d14cb9f03044e11f7c056dae1e576bb5cd3716':
don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)
Scott Main [Fri, 21 Jan 2011 20:00:51 +0000 (12:00 -0800)]
Merge "don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
Scott Main [Fri, 21 Jan 2011 19:58:56 +0000 (11:58 -0800)]
don't use the sdkdoc template if the index file is a preview
(the features.html doc is no longer used, so removed check for that also)
Change-Id: I1985b2e48060337030df53c19051ea363cb3b700
Jean-Baptiste Queru [Fri, 21 Jan 2011 15:49:35 +0000 (07:49 -0800)]
Revert "Merge commit '
50738779' into gingerbread-plus-aosp" - do not merge
This reverts commit
7e1ce27c08ec57032520613488ec2fe5b3795126, reversing
changes made to
7dfc1270967c96be6dcd58fb7770c07482a7e90d.
Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
Ed Heyl [Fri, 21 Jan 2011 02:08:34 +0000 (18:08 -0800)]
Merge commit '
50738779' into gingerbread-plus-aosp
Conflicts:
core/version_defaults.mk
Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
Dianne Hackborn [Thu, 20 Jan 2011 20:17:41 +0000 (12:17 -0800)]
DO NOT MERGE Fix issue #
3373438: Update GBMR versions
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
Eric Fischer [Tue, 18 Jan 2011 23:35:46 +0000 (15:35 -0800)]
am
54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
* commit '
54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
Eric Fischer [Tue, 18 Jan 2011 23:33:39 +0000 (15:33 -0800)]
Merge "Flesh out the languages_full list with recently added locales." into gingerbread
David 'Digit' Turner [Sun, 16 Jan 2011 22:51:28 +0000 (14:51 -0800)]
am
755bed4c: Merge "Add support for custom Linux host toolchains when building the SDK."
* commit '
755bed4cc8ed20449f807feeff44e98c8b20c3ba':
Add support for custom Linux host toolchains when building the SDK.
David 'Digit' Turner [Sun, 16 Jan 2011 22:30:34 +0000 (14:30 -0800)]
Merge "Add support for custom Linux host toolchains when building the SDK."
OSDN Git Service
