OSDN Git Service
The Android Automerger [Mon, 22 Nov 2010 15:22:52 +0000 (07:22 -0800)]
HRH53
Change-Id: Idd2903a7b7df1c15cd2f0b55d15ec18587f7aa7d
The Android Automerger [Mon, 22 Nov 2010 15:22:33 +0000 (07:22 -0800)]
Merge branch 'master' into honeycomb-release
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:56:31 +0000 (16:56 -0800)]
am
6c7b6fb3: resolved conflicts for merge of
b2028868 to gingerbread-plus-aosp
* commit '
6c7b6fb3d2fda5cc5b881e01eb8bb0936ef0eeaf':
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:56:26 +0000 (16:56 -0800)]
am
554eeb6c: am
493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
* commit '
554eeb6c7426c8c1df551516cff903d69ae94f26':
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
android-build SharedAccount [Fri, 19 Nov 2010 21:45:34 +0000 (13:45 -0800)]
HRH50B
Change-Id: I443728f384bbb338c31e90c36b2bfcb677493c4d
Jean-Baptiste Queru [Fri, 19 Nov 2010 20:35:33 +0000 (12:35 -0800)]
resolved conflicts for merge of
b2028868 to gingerbread-plus-aosp
Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
The Android Automerger [Fri, 19 Nov 2010 20:17:18 +0000 (12:17 -0800)]
HRH50
Change-Id: I7fe4e7cebbd1c60ac19bfb0b2a994e7b1575b4f8
The Android Automerger [Fri, 19 Nov 2010 20:17:08 +0000 (12:17 -0800)]
Merge branch 'master' into honeycomb-release
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:15:56 +0000 (11:15 -0800)]
Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings"
Bruce Beare [Thu, 14 Oct 2010 21:12:46 +0000 (14:12 -0700)]
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:15:19 +0000 (11:15 -0800)]
am
493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
* commit '
493306f7c318d632186bebd732708d4299e66a62':
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:10:14 +0000 (11:10 -0800)]
am
cc21582f: resolved conflicts for merge of
4130c80a to gingerbread-plus-aosp
* commit '
cc21582fb3699e5384dc38dad45a575451375d1a':
Correct makefile test for stagefright build
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:01:22 +0000 (11:01 -0800)]
Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:58:11 +0000 (10:58 -0800)]
resolved conflicts for merge of
4130c80a to gingerbread-plus-aosp
Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:45:27 +0000 (10:45 -0800)]
Merge "Correct makefile test for stagefright build"
Bruce Beare [Thu, 14 Oct 2010 21:14:17 +0000 (14:14 -0700)]
Correct makefile test for stagefright build
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:38:49 +0000 (10:38 -0800)]
am
f41934fc: am
26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
* commit '
f41934fcd42c56a02742014e8e24520a85166117':
Display the TARGET_ARCH_VARIANT
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:37:07 +0000 (10:37 -0800)]
am
26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
* commit '
26d8c5896e937ed677007c23d46d6759845fe91f':
Display the TARGET_ARCH_VARIANT
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:29:14 +0000 (10:29 -0800)]
Merge "Display the TARGET_ARCH_VARIANT"
Ying Wang [Fri, 19 Nov 2010 18:27:47 +0000 (10:27 -0800)]
am
92cc4c07: am
b26a65b5: Merge "Restrict make version to 3.81"
* commit '
92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
Restrict make version to 3.81
Ying Wang [Fri, 19 Nov 2010 18:24:57 +0000 (10:24 -0800)]
am
b26a65b5: Merge "Restrict make version to 3.81"
* commit '
b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
Restrict make version to 3.81
android-build SharedAccount [Fri, 19 Nov 2010 00:24:59 +0000 (16:24 -0800)]
HRH49D
Change-Id: I27548d52a13b1de01a15c16bd0f137801546bb4e
Jeff Brown [Thu, 18 Nov 2010 22:32:19 +0000 (14:32 -0800)]
Merge "Revert change removing AVRCP.kl and cpcap-key.kl"
Jeff Brown [Thu, 18 Nov 2010 22:29:59 +0000 (14:29 -0800)]
Revert change removing AVRCP.kl and cpcap-key.kl
Cannot remove these legacy prebuilts yet because they are
referenced in the SDK.
Change-Id: I87b6d1145932edc9335b9a800672e7f653ce5521
Kenny Root [Thu, 18 Nov 2010 22:27:00 +0000 (14:27 -0800)]
Fix typo in ALL_PREBUILT error message
Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
Jeff Brown [Thu, 18 Nov 2010 22:20:53 +0000 (14:20 -0800)]
Merge "Use prebuilt keymaps in frameworks/base/data/keyboards."
Scott Main [Thu, 18 Nov 2010 20:28:44 +0000 (12:28 -0800)]
docs: revise stylesheet to allow "notes" in divs, not just paragraphs
Change-Id: Ia78a82dd330a4f31076b74ce86237af3aca1ba2e
The Android Automerger [Thu, 18 Nov 2010 21:39:12 +0000 (13:39 -0800)]
HRH49C
Change-Id: I6e8ae6ce222d6f500c8a09b0dae583d0d0329382
Ying Wang [Thu, 18 Nov 2010 19:20:21 +0000 (11:20 -0800)]
Merge "Restrict make version to 3.81"
Ying Wang [Thu, 18 Nov 2010 18:32:12 +0000 (10:32 -0800)]
Restrict make version to 3.81
Bug:
3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.
Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
The Android Automerger [Thu, 18 Nov 2010 19:05:21 +0000 (11:05 -0800)]
HRH49B
Change-Id: I534748b2984f9e22377b784bfbfbf346c7eb2bb8
The Android Automerger [Thu, 18 Nov 2010 19:05:11 +0000 (11:05 -0800)]
Merge branch 'master' into honeycomb-release
The Android Automerger [Thu, 18 Nov 2010 15:41:32 +0000 (07:41 -0800)]
HRH49
Change-Id: I8016129d2414a2cd367a5ea0ec54d8554384d30b
The Android Automerger [Thu, 18 Nov 2010 15:40:49 +0000 (07:40 -0800)]
Merge branch 'master' into honeycomb-release
Jeff Brown [Thu, 18 Nov 2010 08:08:24 +0000 (00:08 -0800)]
Use prebuilt keymaps in frameworks/base/data/keyboards.
Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
Ying Wang [Thu, 18 Nov 2010 01:45:36 +0000 (17:45 -0800)]
Pass extfs sparse image flag to the release tool.
Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
android-build SharedAccount [Thu, 18 Nov 2010 00:08:07 +0000 (16:08 -0800)]
HRH48B
Change-Id: I7bf8e1ebb91c13e77115b3bde84d3c8835d19d9a
Ying Wang [Thu, 18 Nov 2010 00:07:40 +0000 (16:07 -0800)]
Merge "Product-configurable sparse ext images."
Ying Wang [Wed, 17 Nov 2010 23:40:38 +0000 (15:40 -0800)]
Product-configurable sparse ext images.
Change-Id: Ifd0ac14d7df331c9f6f1e3eee0722e07b4ab199a
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:52:09 +0000 (15:52 -0800)]
am
766a2a21: am
48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
* commit '
766a2a2125d41e8bfb88112601a34af08f47f7f1':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:27:13 +0000 (15:27 -0800)]
am
48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
* commit '
48ec6d6f814a70068c4632b468cd7872f34295ad':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:15:32 +0000 (15:15 -0800)]
Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
Johnnie Birch [Mon, 2 Aug 2010 19:12:15 +0000 (12:12 -0700)]
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
Xavier Ducrohet [Wed, 17 Nov 2010 21:06:00 +0000 (13:06 -0800)]
Merge "Temp disabling of some apps in SDK build."
The Android Automerger [Wed, 17 Nov 2010 19:34:41 +0000 (11:34 -0800)]
HRH48
Change-Id: Ib79c5d6d458f4b6d911096fdf39b3ef19bba483e
The Android Automerger [Wed, 17 Nov 2010 19:34:30 +0000 (11:34 -0800)]
Merge branch 'master' into honeycomb-release
Scott Main [Wed, 17 Nov 2010 00:23:24 +0000 (16:23 -0800)]
docs: add preliminary watermark to docs
Change-Id: Ifc9ea60b53d3e5e52b9cd52174a6d8f0982fe523
The Android Automerger [Tue, 16 Nov 2010 16:55:07 +0000 (08:55 -0800)]
HRH47
Change-Id: I8a599fc8e8bc678029133e96d5ba6bc957b7496e
Xavier Ducrohet [Tue, 16 Nov 2010 02:16:49 +0000 (18:16 -0800)]
Temp disabling of some apps in SDK build.
Change-Id: Ib8495cfe935ab96997f19e9af5a93ebbb99493ab
android-build SharedAccount [Tue, 16 Nov 2010 00:53:09 +0000 (16:53 -0800)]
HRH46B
Change-Id: I6169d03f6443f666ebb216595b299ccc62e385e3
The Android Automerger [Mon, 15 Nov 2010 15:59:53 +0000 (07:59 -0800)]
HRH46
Change-Id: I620554b033b1d6e375ca0522a698a3a228d92435
The Android Automerger [Mon, 15 Nov 2010 15:59:34 +0000 (07:59 -0800)]
Merge branch 'master' into honeycomb-release
Ficus Kirkpatrick [Sat, 13 Nov 2010 01:38:20 +0000 (17:38 -0800)]
Fix a spelling error.
Change-Id: If89847fa16db4e2b30372678ab8f7117ad5fa0c6
The Android Automerger [Fri, 12 Nov 2010 21:23:47 +0000 (13:23 -0800)]
HRH43
Change-Id: I2ff1da9d8774369fdff6965ff1e5de8b08e2ab2e
The Android Automerger [Fri, 12 Nov 2010 21:23:24 +0000 (13:23 -0800)]
Merge branch 'master' into honeycomb-release
android-build SharedAccount [Fri, 12 Nov 2010 00:36:13 +0000 (16:36 -0800)]
HRH42B
Change-Id: I3c77904281d35bd2e9bad4d17f7e7be76d1b0573
Xavier Ducrohet [Thu, 11 Nov 2010 23:01:52 +0000 (15:01 -0800)]
am
f5f81fc7: am
01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit '
f5f81fc75e6f4ab598fab8876efc892243287def':
Rename layoutlib_utils into ide_common
Xavier Ducrohet [Thu, 11 Nov 2010 22:59:57 +0000 (14:59 -0800)]
am
01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit '
01a9840ba7545d9175575cc3d95b2584b2dee31c':
Rename layoutlib_utils into ide_common
Xavier Ducrohet [Thu, 11 Nov 2010 22:45:05 +0000 (14:45 -0800)]
Merge "Rename layoutlib_utils into ide_common"
Xavier Ducrohet [Thu, 11 Nov 2010 20:44:16 +0000 (12:44 -0800)]
Rename layoutlib_utils into ide_common
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
The Android Automerger [Thu, 11 Nov 2010 15:28:16 +0000 (07:28 -0800)]
HRH42
Change-Id: Ibe615f069656737752d627ac7d531c217c323eb9
The Android Automerger [Wed, 10 Nov 2010 15:25:17 +0000 (07:25 -0800)]
HRH41
Change-Id: Id5c9f73595ac8e0b8f11a81004b9843e206b9b78
The Android Automerger [Wed, 10 Nov 2010 15:24:31 +0000 (07:24 -0800)]
Merge branch 'master' into honeycomb-release
Patrick Scott [Wed, 10 Nov 2010 12:52:42 +0000 (04:52 -0800)]
Merge "Replace grep | head | awk | tr | tr with awk."
android-build SharedAccount [Wed, 10 Nov 2010 00:24:41 +0000 (16:24 -0800)]
HRH40B
Change-Id: I201ef401d6013351f41ced7864a98e8d5aae425e
Joe Onorato [Tue, 9 Nov 2010 16:53:01 +0000 (08:53 -0800)]
Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt.
Bug:
3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
The Android Automerger [Tue, 9 Nov 2010 15:27:48 +0000 (07:27 -0800)]
HRH40
Change-Id: If74e3a4aeefd5a6a0a22205a2e0e1b77d6798baa
The Android Automerger [Tue, 9 Nov 2010 15:26:57 +0000 (07:26 -0800)]
Merge branch 'master' into honeycomb-release
Scott Main [Tue, 9 Nov 2010 03:25:01 +0000 (19:25 -0800)]
am
1be24531: am
badffa84: docs: revise intro to reflect changes to quick start
* commit '
1be245314ddc88e5bde92e9a0660b1fbbd63422f':
docs: revise intro to reflect changes to quick start
Scott Main [Tue, 9 Nov 2010 01:10:25 +0000 (17:10 -0800)]
am
badffa84: docs: revise intro to reflect changes to quick start
* commit '
badffa84327de8154ea3ba96dcf908478c4d4a17':
docs: revise intro to reflect changes to quick start
Scott Main [Mon, 8 Nov 2010 20:28:14 +0000 (12:28 -0800)]
docs: revise intro to reflect changes to quick start
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
The Android Automerger [Mon, 8 Nov 2010 16:24:22 +0000 (08:24 -0800)]
HRH39
Change-Id: I44577431ff79cef28ffbba6c0e0197efe6b22daf
The Android Automerger [Mon, 8 Nov 2010 16:23:43 +0000 (08:23 -0800)]
Merge branch 'master' into honeycomb-release
Patrick Scott [Fri, 5 Nov 2010 19:00:50 +0000 (15:00 -0400)]
Replace grep | head | awk | tr | tr with awk.
Head was causing a SIGPIPE in grep that only appeared when using
distss. This wasn't causing any build problems but spewed a lot
of warnings.
However, this change trims the command from 5 proccesses to 1 which is
nice.
Change-Id: Iac846ec1d01a022976cfc5fd28091a720ab161e7
Scott Main [Sat, 6 Nov 2010 23:25:09 +0000 (16:25 -0700)]
am
9f7e7946: am
c775c754: docs: add gingerbread logo for homepage
* commit '
9f7e7946959fa776731283cbef97646b6d9d3013':
docs: add gingerbread logo for homepage
Scott Main [Sat, 6 Nov 2010 23:24:08 +0000 (16:24 -0700)]
am
56c69603: am
ec97fd30: docs: revisions to ndk download intro
* commit '
56c69603adb97e6f0a81874f16d81f538259cd55':
docs: revisions to ndk download intro
Dirk Dougherty [Sat, 6 Nov 2010 23:18:20 +0000 (16:18 -0700)]
Doc change: Merge commit '
9561b575' into master
Conflicts:
tools/droiddoc/templates-sdk/sdkpage.cs
Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2
Scott Main [Sat, 6 Nov 2010 21:21:16 +0000 (14:21 -0700)]
am
c775c754: docs: add gingerbread logo for homepage
* commit '
c775c754f13bd54b7d5da8c28186cdd8167dc53a':
docs: add gingerbread logo for homepage
Wink Saville [Fri, 5 Nov 2010 22:38:37 +0000 (15:38 -0700)]
Merge "Rename protoc to aprotoc."
android-build SharedAccount [Fri, 5 Nov 2010 22:06:14 +0000 (15:06 -0700)]
HRH35C
Change-Id: I9ad977ba8626ad0d2f72fd1d8d8552f8c788cd37
Scott Main [Fri, 5 Nov 2010 21:29:07 +0000 (14:29 -0700)]
docs: add gingerbread logo for homepage
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
Scott Main [Fri, 5 Nov 2010 20:57:15 +0000 (13:57 -0700)]
am
ec97fd30: docs: revisions to ndk download intro
* commit '
ec97fd30a6af6d954f156620a69c29352e012d39':
docs: revisions to ndk download intro
Robert Ly [Fri, 5 Nov 2010 20:57:10 +0000 (13:57 -0700)]
am
706e41e5: Update the template text for the NDK download page to point to new links
* commit '
706e41e55f2e3b456c51b56ba07d1dfd56716af9':
Update the template text for the NDK download page to point to new links
Ying Wang [Fri, 5 Nov 2010 18:30:58 +0000 (11:30 -0700)]
Allow module-specific protoc flags.
You can add local protoc flags via LOCAL_PROTOC_FLAGS.
Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
Wink Saville [Fri, 5 Nov 2010 18:28:51 +0000 (11:28 -0700)]
Rename protoc to aprotoc.
With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.
Change-Id: Id6900baacc7d57abee5dc5f694b013d7a42b35c6
Ying Wang [Fri, 5 Nov 2010 18:20:03 +0000 (11:20 -0700)]
Set the correct proto intermediate dir for native modules.
Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
Ying Wang [Fri, 5 Nov 2010 17:33:41 +0000 (17:33 +0000)]
Merge "Integrate protocol buffer compiler into the build system."
Scott Main [Fri, 5 Nov 2010 04:02:14 +0000 (21:02 -0700)]
docs: revisions to ndk download intro
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
android-build SharedAccount [Thu, 4 Nov 2010 23:41:51 +0000 (16:41 -0700)]
HRH35B
Change-Id: Ibc8cac9177579121d74d1bc02afe826780cfac37
Robert Ly [Wed, 3 Nov 2010 01:35:43 +0000 (18:35 -0700)]
Update the template text for the NDK download page to point to new
links
Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
Ying Wang [Thu, 4 Nov 2010 20:21:20 +0000 (13:21 -0700)]
Merge "'make dump-products' to dump products."
Jean-Baptiste Queru [Thu, 4 Nov 2010 17:57:36 +0000 (10:57 -0700)]
am
57723b52: Merge
7b393fd1 from open-source master
* commit '
57723b52cdb446c751ba8e65fa060e7a4faf4907':
Add version_defaults.mk to be a prerequisite of build.prop
The Android Automerger [Thu, 4 Nov 2010 16:34:04 +0000 (09:34 -0700)]
HRH35
Change-Id: Ie2a5b8d1fc7eb176b8e1878391434515e36eb134
The Android Automerger [Thu, 4 Nov 2010 16:33:08 +0000 (09:33 -0700)]
Merge branch 'master' into honeycomb-release
Jean-Baptiste Queru [Thu, 4 Nov 2010 14:24:48 +0000 (07:24 -0700)]
Merge
7b393fd1 from open-source master
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
android-build SharedAccount [Wed, 3 Nov 2010 23:07:24 +0000 (16:07 -0700)]
HRH34B: 73911 on master + cherry pick of
acdeeee57f829d6b33fc71df166048c70faa0168
Change-Id: I21cbb1b5178b2263080bc71c92356c6851fa4dff
The Android Automerger [Wed, 3 Nov 2010 23:00:42 +0000 (16:00 -0700)]
HRH34
Change-Id: Ib14874624edc09898c0c7815d2b1462de1276984
The Android Automerger [Wed, 3 Nov 2010 22:34:27 +0000 (15:34 -0700)]
Merge branch 'master' into honeycomb-release
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:59:25 +0000 (10:59 -0700)]
am
6be29424: am
892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
* commit '
6be29424c60cb5e17ce0aacb026c1cb88a62428b':
build: Add spare size flag to mkyaffs2image
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:29:55 +0000 (10:29 -0700)]
Merge "Add version_defaults.mk to be a prerequisite of build.prop"
OSDN Git Service
