OSDN Git Service
Sriram Raman [Sun, 5 Dec 2010 02:15:28 +0000 (21:15 -0500)]
HRH64c
Change-Id: I1f0fa42e177e6e47032043c2eaf99478cec76829
Sriram Raman [Sat, 4 Dec 2010 23:18:21 +0000 (18:18 -0500)]
HRH64B
Change-Id: If7b2f9d033cbf10ee6cfafa9ca2b160fec981a47
android-merger [Sat, 4 Dec 2010 00:07:25 +0000 (16:07 -0800)]
HRH64
Change-Id: Ib717f8e1f11a82039d50d20f378c8f7c7a581bcb
android-build SharedAccount [Thu, 2 Dec 2010 22:49:08 +0000 (14:49 -0800)]
HRH63B
Change-Id: Ia9336baef4cf44814c82d12233b8c30b9c11bb11
The Android Automerger [Thu, 2 Dec 2010 15:55:25 +0000 (07:55 -0800)]
HRH63
Change-Id: I3c7b1678c30ac86d5f1df93290cbb00f11b1d361
android-build SharedAccount [Thu, 2 Dec 2010 02:05:41 +0000 (18:05 -0800)]
HRH62C
Change-Id: I56b534e7a0d6c5e998d5514e36c96b7ed4b881a6
Ed Heyl [Thu, 2 Dec 2010 01:37:12 +0000 (17:37 -0800)]
HRH62B
Change-Id: I3d2aa54ba19ceea9e1ff578dcc552a08ea100b34
The Android Automerger [Wed, 1 Dec 2010 15:22:14 +0000 (07:22 -0800)]
HRH62
Change-Id: I14b6720c5f6e5887b4182428cad6232dce507a66
The Android Automerger [Wed, 1 Dec 2010 15:21:59 +0000 (07:21 -0800)]
Merge branch 'master' into honeycomb-release
Sriram Raman [Tue, 30 Nov 2010 20:09:19 +0000 (15:09 -0500)]
resolved conflicts for merge of
064a4562 to master
Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72
Sriram Raman [Tue, 30 Nov 2010 19:45:14 +0000 (11:45 -0800)]
am
c647aeca: Add mkuserimg.sh, make_ext4fs to otatools
* commit '
c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
Add mkuserimg.sh, make_ext4fs to otatools
The Android Automerger [Tue, 30 Nov 2010 15:22:53 +0000 (07:22 -0800)]
HRH61
Change-Id: Ied7776007ea0e8762a2700e9605271250bf04e9c
The Android Automerger [Tue, 30 Nov 2010 15:22:41 +0000 (07:22 -0800)]
Merge branch 'master' into honeycomb-release
Sriram Raman [Mon, 29 Nov 2010 23:51:20 +0000 (18:51 -0500)]
Add mkuserimg.sh, make_ext4fs to otatools
Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
Scott Main [Mon, 29 Nov 2010 23:37:31 +0000 (15:37 -0800)]
Merge "docs: revisions to the sdk doc template for preview sdk, remove ndk download table for offline docs"
The Android Automerger [Mon, 29 Nov 2010 17:28:53 +0000 (09:28 -0800)]
HRH60
Change-Id: I164ebd74af4d50e1d8720ea4028ad1e7df9cc1ef
The Android Automerger [Mon, 29 Nov 2010 17:28:44 +0000 (09:28 -0800)]
Merge branch 'master' into honeycomb-release
android-build SharedAccount [Wed, 24 Nov 2010 20:08:05 +0000 (12:08 -0800)]
HRH54C
Change-Id: I8cef87bbae269f8fefe26e420e8075d1e78e4e65
Jean-Baptiste Queru [Wed, 24 Nov 2010 17:35:29 +0000 (09:35 -0800)]
am
29ead582: am
d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit '
29ead58259d47997d7caedf9080f4a2f9c9bd358':
Added generic hook for loading vendor specific tasks.
Jean-Baptiste Queru [Wed, 24 Nov 2010 17:33:25 +0000 (09:33 -0800)]
am
d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit '
d2dd86529982cd05b4010248cea368fbef763ef2':
Added generic hook for loading vendor specific tasks.
Jean-Baptiste Queru [Wed, 24 Nov 2010 17:23:35 +0000 (09:23 -0800)]
Merge "Added generic hook for loading vendor specific tasks."
Claes Elgemark [Fri, 12 Nov 2010 14:46:00 +0000 (15:46 +0100)]
Added generic hook for loading vendor specific tasks.
With this change it is possible for vendors to create rules that depend on
targets defined in Android.mk files.
This makes it easier to decouple functionality from the core buildsystem.
Very much as is done within the build git for tasks like creating SDK addon,
Generating eclipse .classpath file etc can then be done for vendors as well.
You can add targets that could perform poststeps on produced modules.
E.g. Do static verification or documentation on modules of a certain type.
You can e.g. create a target that would resign and upload all apks to a
binary repository.
Change-Id: Ic0fa7b60b919ede3c59fa2885d1fd4be1e928c04
Jeff Brown [Wed, 24 Nov 2010 00:47:34 +0000 (16:47 -0800)]
Delete the tuttle keymaps.
These files have been obsolete for years.
Change-Id: I489d22799dd0fd476b6afe296e24434d437ea75b
android-build SharedAccount [Tue, 23 Nov 2010 23:11:54 +0000 (15:11 -0800)]
HRH54B
Change-Id: I1d78ff34582129c4ff665e28abaae8a12756c618
Jean-Baptiste Queru [Tue, 23 Nov 2010 18:54:22 +0000 (10:54 -0800)]
am
ce5d7e04: am
7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"
* commit '
ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
Jean-Baptiste Queru [Tue, 23 Nov 2010 18:51:44 +0000 (10:51 -0800)]
am
7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"
* commit '
7fbeda2b1ed2872b2e2ab2f7faf386a3755502df':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
Jean-Baptiste Queru [Tue, 23 Nov 2010 18:37:08 +0000 (10:37 -0800)]
Merge "Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'"
Magnus Bäck [Mon, 8 Nov 2010 12:44:02 +0000 (13:44 +0100)]
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
Commit
e334d255 added the `all' pseudo-goal (aka internal modifier
target) to have make dex all Java modules. Unfortunately the new
pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual
phony goal was added, resulting in the obvious
make: *** No rule to make target `all'. Stop.
error message when running `make all'. This commit changes
INTERNAL_MODIFIER_TARGETS to also include `all' so that the
pseudo-goal is treated just like `showcommands' and `checkbuild'.
Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
The Android Automerger [Tue, 23 Nov 2010 17:34:05 +0000 (09:34 -0800)]
HRH54
Change-Id: I3fb1e970ef377af606bdd1d0466cd05cdd414b3f
Scott Main [Mon, 22 Nov 2010 23:02:01 +0000 (15:02 -0800)]
docs: revisions to the sdk doc template for preview sdk,
remove ndk download table for offline docs
Change-Id: I13da1e5ab825f1d5c6a19ef9a76c36a3edd88bf6
android-build SharedAccount [Mon, 22 Nov 2010 23:28:12 +0000 (15:28 -0800)]
HRH53B
Change-Id: Idca73ea598fab74e2373dab847f84cd735864bb2
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
OSDN Git Service
