OSDN Git Service
Jean-Baptiste Queru [Sun, 24 Oct 2010 21:02:10 +0000 (14:02 -0700)]
resolved conflicts for merge of
cbc479c3 to master
Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559
Jean-Baptiste Queru [Sun, 24 Oct 2010 20:31:17 +0000 (13:31 -0700)]
Set defauilt ringtone and default notification in full builds
Change-Id: Ia5c76d393d428dffc72cb8440720fa0f0884e401
Jean-Baptiste Queru [Sun, 24 Oct 2010 13:08:24 +0000 (06:08 -0700)]
resolved conflicts for merge of
cd3bd740 to master
Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
Jean-Baptiste Queru [Sun, 24 Oct 2010 11:53:58 +0000 (04:53 -0700)]
Merge "Delete obsolete full_no_telephony.mk"
Shih-wei Liao [Sat, 23 Oct 2010 10:07:13 +0000 (03:07 -0700)]
Turn off llvm-rs-link to make launch time go faster.
Change-Id: Idbbb5e24a269e3c9a1911b47b4fbb1616cef5803
Jean-Baptiste Queru [Sat, 23 Oct 2010 01:56:30 +0000 (18:56 -0700)]
Use the new list of all audio files
Change-Id: Ic510c243dde616cca3374f6aa6a2835690cf6818
Jean-Baptiste Queru [Sat, 23 Oct 2010 01:03:47 +0000 (18:03 -0700)]
am
68f21cdc: (-s ours) Minor cleanup - DO NOT MERGE
Merge commit '
68f21cdc71b9ad7362e4f7c22d44a601c9e58f07'
* commit '
68f21cdc71b9ad7362e4f7c22d44a601c9e58f07':
Minor cleanup - DO NOT MERGE
Jean-Baptiste Queru [Fri, 22 Oct 2010 23:37:08 +0000 (16:37 -0700)]
Delete obsolete full_no_telephony.mk
Change-Id: I944209ce5dc70cd1f43a9204faff38bc367d923f
Jean-Baptiste Queru [Fri, 22 Oct 2010 23:28:33 +0000 (16:28 -0700)]
Improve setup of base products.
Split telephony into its own product, so that we can easily
add telephony support to any configuration without pulling
anything else. Use it from generic.
Split the "full" family between a (no-telephony) base,
a telephony version of the same (both of which can be used
as a starting point for on-device builds), and the true classic
full which is an emulator build.
Change-Id: I616d34f2a29415b8ec997173f8e893c312ade5c2
Jean-Baptiste Queru [Fri, 22 Oct 2010 23:13:02 +0000 (16:13 -0700)]
Minor cleanup - DO NOT MERGE
Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
Jean-Baptiste Queru [Fri, 22 Oct 2010 22:10:18 +0000 (15:10 -0700)]
am
dd46ad41: (-s ours) Clean up full config - DO NOT MERGE
Jean-Baptiste Queru [Fri, 22 Oct 2010 21:41:55 +0000 (14:41 -0700)]
Clean up full config - DO NOT MERGE
This splits the existing full.mk in two parts:
-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk
This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.
Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
Ying Wang [Fri, 22 Oct 2010 21:41:17 +0000 (14:41 -0700)]
resolved conflicts for merge of
e67944ee to master
Change-Id: I9284d5a5df6fc963bc4c70c87a505857f41c93af
Ying Wang [Fri, 22 Oct 2010 21:14:59 +0000 (14:14 -0700)]
Switch Unbundled apps from generic.mk to full.mk.
Change-Id: I7aaaef8f2032590d55ccec77621c6b3f4c121f9a
Jean-Baptiste Queru [Fri, 22 Oct 2010 20:02:38 +0000 (13:02 -0700)]
am
040e8cf0: Fix list of locales (bad country codes).
Jean-Baptiste Queru [Fri, 22 Oct 2010 19:34:32 +0000 (12:34 -0700)]
Fix list of locales (bad country codes).
DA->DK, SV->SE
Change-Id: I7bc7f64905ecd583e1a7ca5b43a8fffd5f3ba383
Jean-Baptiste Queru [Fri, 22 Oct 2010 19:29:10 +0000 (12:29 -0700)]
resolved conflicts for merge of
8928ef8b to master
Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e
Jean-Baptiste Queru [Fri, 22 Oct 2010 19:12:52 +0000 (12:12 -0700)]
am
0332f0ac: Truly default to the full config.
Jean-Baptiste Queru [Fri, 22 Oct 2010 17:22:42 +0000 (10:22 -0700)]
Make a full list of locales available
Use it for the sim build and full build.
Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e
Jean-Baptiste Queru [Fri, 22 Oct 2010 16:52:09 +0000 (09:52 -0700)]
Truly default to the full config.
It is much better than generic for emulator-based work.
Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
Ben Cheng [Fri, 22 Oct 2010 16:49:47 +0000 (09:49 -0700)]
Merge "Insert directives to work around a CPU bug."
Ben Cheng [Thu, 21 Oct 2010 22:15:09 +0000 (15:15 -0700)]
Insert directives to work around a CPU bug.
Bug:
3117632
Change-Id: I2fb58e7093984d18d2d2d21edf687206f4ddab31
Ying Wang [Thu, 21 Oct 2010 20:45:14 +0000 (13:45 -0700)]
am
4038bbc4: am
09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.
Merge commit '
4038bbc426776d8adc57d7c3c8123357b50b1615'
* commit '
4038bbc426776d8adc57d7c3c8123357b50b1615':
Don't build update zip package if there is no kernel, or it's generic device.
Dianne Hackborn [Thu, 21 Oct 2010 17:51:08 +0000 (10:51 -0700)]
Merge "We are API 9 compatible."
Jean-Baptiste Queru [Thu, 21 Oct 2010 16:53:57 +0000 (09:53 -0700)]
am
5a98ec04: resolved conflicts for merge of
54ddcc27 to gingerbread-plus-aosp
Merge commit '
5a98ec046c555b02d2f306efc117f7dafd32fc7d'
* commit '
5a98ec046c555b02d2f306efc117f7dafd32fc7d':
Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
Dianne Hackborn [Thu, 21 Oct 2010 01:54:17 +0000 (18:54 -0700)]
We are API 9 compatible.
Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
Ying Wang [Wed, 20 Oct 2010 21:28:52 +0000 (14:28 -0700)]
am
09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.
Merge commit '
09a00a672bb18dccc97af6090739ea275c39d8a3' into gingerbread-plus-aosp
* commit '
09a00a672bb18dccc97af6090739ea275c39d8a3':
Don't build update zip package if there is no kernel, or it's generic device.
Ying Wang [Wed, 20 Oct 2010 21:01:09 +0000 (14:01 -0700)]
Don't build update zip package if there is no kernel, or it's generic device.
Move the update package code block forward to be side by side with the ota package code,
so that they are built under the same condition.
Bug:
3116070
Change-Id: I8055909cc614bfbeee215d1b770a80f728e326ee
Jean-Baptiste Queru [Tue, 19 Oct 2010 22:19:45 +0000 (15:19 -0700)]
resolved conflicts for merge of
54ddcc27 to gingerbread-plus-aosp
Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
Jean-Baptiste Queru [Tue, 19 Oct 2010 21:43:38 +0000 (14:43 -0700)]
Merge "Explicitly declare assembly only __ASSEMBLY__ macro for assembly source"
Jean-Baptiste Queru [Tue, 19 Oct 2010 16:56:28 +0000 (09:56 -0700)]
Jean-Baptiste Queru [Mon, 18 Oct 2010 22:39:59 +0000 (15:39 -0700)]
Ignore
8cd38383 from gingerbread
Change-Id: I6414756b09317f0131ac443bf4b1acad82a2574b
Dianne Hackborn [Mon, 18 Oct 2010 18:46:50 +0000 (11:46 -0700)]
Gingerbread becomes real.
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
Scott Main [Sun, 17 Oct 2010 18:17:33 +0000 (11:17 -0700)]
am
67206677: (-s ours) am
c0aa1e1b: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Merge commit '
672066778bdf3aacdd859b88484cddbd6c8b7909'
* commit '
672066778bdf3aacdd859b88484cddbd6c8b7909':
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Nick Pelly [Sun, 17 Oct 2010 18:17:24 +0000 (11:17 -0700)]
Scott Main [Sat, 16 Oct 2010 01:22:09 +0000 (18:22 -0700)]
am
c0aa1e1b: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Merge commit '
c0aa1e1b305d85baef1dcedabbea1d084f3ed54a' into gingerbread-plus-aosp
* commit '
c0aa1e1b305d85baef1dcedabbea1d084f3ed54a':
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Nick Pelly [Sat, 16 Oct 2010 01:21:29 +0000 (18:21 -0700)]
am
e07a9d4a: Always install libnfc_ndef.
Merge commit '
e07a9d4aa4afd27461877fbfd4b132a5c6c34954' into gingerbread-plus-aosp
* commit '
e07a9d4aa4afd27461877fbfd4b132a5c6c34954':
Always install libnfc_ndef.
Xavier Ducrohet [Fri, 15 Oct 2010 20:40:46 +0000 (13:40 -0700)]
am
bf4643e2: am
1aff79ad: Add SystemUI (notification bar) to SDK build.
Merge commit '
bf4643e2df9aafabca103f9242b5e7c7da9ded58'
* commit '
bf4643e2df9aafabca103f9242b5e7c7da9ded58':
Add SystemUI (notification bar) to SDK build.
Scott Main [Fri, 15 Oct 2010 18:20:26 +0000 (11:20 -0700)]
Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Scott Main [Fri, 15 Oct 2010 18:17:29 +0000 (11:17 -0700)]
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053
Ying Wang [Fri, 15 Oct 2010 17:05:02 +0000 (10:05 -0700)]
Merge "Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only."
Nick Pelly [Fri, 15 Oct 2010 08:01:20 +0000 (01:01 -0700)]
Always install libnfc_ndef.
libnfc_ndef is the (very small) library to implement NDEF message parsing.
Change-Id: Iab39a0904e1be2eb1fb07ef9f5cef5095c8a5b7b
Signed-off-by: Nick Pelly <npelly@google.com>
Jim Huang [Thu, 14 Oct 2010 08:15:56 +0000 (16:15 +0800)]
Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
To isolate the assembly-only macros in header files, such as
<machine/cpu-features.h>, this patch attempts to declare assembly
only __ASSEMBLY__ macro in build system.
Change-Id: I081c3e46258a9256b20995e4d0b473c64745444c
Xavier Ducrohet [Thu, 14 Oct 2010 05:53:45 +0000 (22:53 -0700)]
am
1aff79ad: Add SystemUI (notification bar) to SDK build.
Merge commit '
1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d' into gingerbread-plus-aosp
* commit '
1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d':
Add SystemUI (notification bar) to SDK build.
Xavier Ducrohet [Thu, 14 Oct 2010 00:26:29 +0000 (17:26 -0700)]
Add SystemUI (notification bar) to SDK build.
Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0
Doug Zongker [Wed, 13 Oct 2010 20:39:56 +0000 (13:39 -0700)]
radio files aren't modules, prebuilt or otherwise
Change-Id: Ic21cf9f7d9657819e40c6700c98e61971dab24b4
Bill Napier [Tue, 12 Oct 2010 23:27:42 +0000 (16:27 -0700)]
am
00b31bee: am
fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
Merge commit '
00b31bee97eb739b03eedddf1cd07a86b50259d8'
* commit '
00b31bee97eb739b03eedddf1cd07a86b50259d8':
Add in MonkeyRunner target (and dependent libs) to SDK build.
Joe Onorato [Tue, 12 Oct 2010 00:12:46 +0000 (17:12 -0700)]
resolved conflicts for merge of
a0eb715a to master
Change-Id: I6341ca672906de3c21800730ac28ba90ecab51ca
Ying Wang [Mon, 11 Oct 2010 23:36:02 +0000 (16:36 -0700)]
Fix typo.
Change-Id: Iabdc6ec1ead4f37294f01ebebc1e71e188455533
Ying Wang [Mon, 11 Oct 2010 23:31:49 +0000 (16:31 -0700)]
Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.
Bug:
3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
Bill Napier [Mon, 11 Oct 2010 22:30:09 +0000 (15:30 -0700)]
am
fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
Merge commit '
fcab84025edd6ff0a7b1f380b75b99297e0b7c31' into gingerbread-plus-aosp
* commit '
fcab84025edd6ff0a7b1f380b75b99297e0b7c31':
Add in MonkeyRunner target (and dependent libs) to SDK build.
Bill Napier [Mon, 11 Oct 2010 22:18:04 +0000 (15:18 -0700)]
Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
Ying Wang [Mon, 11 Oct 2010 20:44:50 +0000 (13:44 -0700)]
Hook up the dependency.
Now llvm-rs-link is directly called by the build system.
Change-Id: I281cc6fd9e21ee7d120ddea390f802b57c894fd6
Shih-wei Liao [Mon, 11 Oct 2010 17:36:42 +0000 (10:36 -0700)]
Enable LLVM_RS_LINK. No longer forking an LLVM linker inside llvm-rs-cc.
Change-Id: I2ebc6ec759daf36d1e77fa8e30147ab8e40b44fc
Bill Napier [Mon, 11 Oct 2010 17:21:10 +0000 (10:21 -0700)]
am
04345cb1: Add in MonkeyRunner target (and dependent libs) to SDK build.
Merge commit '
04345cb1147f220c67410c16b362223b1e8952f7'
* commit '
04345cb1147f220c67410c16b362223b1e8952f7':
Add in MonkeyRunner target (and dependent libs) to SDK build.
Xavier Ducrohet [Sun, 10 Oct 2010 21:37:00 +0000 (14:37 -0700)]
am
747bc08a: Merge "Add all languages to the SDK image." into gingerbread
Merge commit '
747bc08a8e78c47395bcc72811bb3e81fb7e557b' into gingerbread-plus-aosp
* commit '
747bc08a8e78c47395bcc72811bb3e81fb7e557b':
Add all languages to the SDK image.
Xavier Ducrohet [Sun, 10 Oct 2010 21:31:10 +0000 (14:31 -0700)]
Merge "Add all languages to the SDK image." into gingerbread
Xavier Ducrohet [Sun, 10 Oct 2010 21:14:49 +0000 (14:14 -0700)]
Add all languages to the SDK image.
Change-Id: I5d715fdc7f802a55786fff73863bbbc108c780d4
Brian Muramatsu [Sun, 10 Oct 2010 19:51:28 +0000 (12:51 -0700)]
am
99185c2a: am
cd7170d7: resolved conflicts for merge of
0f8fcbe2 to gingerbread
Merge commit '
99185c2a462d563855e4bc0c1e5649a21b2e186b'
* commit '
99185c2a462d563855e4bc0c1e5649a21b2e186b':
Support Additional CTS Host Jars
Bill Napier [Sun, 10 Oct 2010 19:06:13 +0000 (12:06 -0700)]
Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
Jean-Baptiste Queru [Sun, 10 Oct 2010 19:00:02 +0000 (12:00 -0700)]
manual merge of
547b902e
Change-Id: Ibfc409f53a82bc7cb5caa6aaf94e18589e06009b
Jean-Baptiste Queru [Sun, 10 Oct 2010 18:57:00 +0000 (11:57 -0700)]
manual merge of
424de177
Change-Id: Iaff23131e9c0ba4de2fc15600f940aa0d23c59fd
Shih-wei Liao [Sun, 10 Oct 2010 16:58:22 +0000 (09:58 -0700)]
Merge "Make naming consistent: llvm-rs-cc and llvm-rs-link."
Ying Wang [Sun, 10 Oct 2010 16:10:22 +0000 (09:10 -0700)]
am
3b008f36: am
83f69eb5: Prepend ccache to CC/CXX if necessary.
Merge commit '
3b008f36956c35f58d510ad3da5090cf21a08349'
* commit '
3b008f36956c35f58d510ad3da5090cf21a08349':
Prepend ccache to CC/CXX if necessary.
Dima Zavin [Sun, 10 Oct 2010 16:10:19 +0000 (09:10 -0700)]
am
21773134: am
4477db78: CHERRY-PICK: propogate module tags for prebuilts
Merge commit '
21773134b44f8d7c7177a60ca94181f2f51ac9c8'
* commit '
21773134b44f8d7c7177a60ca94181f2f51ac9c8':
CHERRY-PICK: propogate module tags for prebuilts
Shih-wei Liao [Fri, 8 Oct 2010 23:57:46 +0000 (16:57 -0700)]
Make naming consistent: llvm-rs-cc and llvm-rs-link.
Change-Id: I8e8ae27548131b47fbbd037d55b472d095d7bb8f
Bill Napier [Sat, 9 Oct 2010 00:37:29 +0000 (17:37 -0700)]
Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I6aa0b1e48dfd0017b3c68fb3b25c02b703ecbd53
Joe Onorato [Fri, 8 Oct 2010 21:36:43 +0000 (14:36 -0700)]
am
5c41c178: am
700b88e1: Pass device characteristic information through to aapt.
Merge commit '
5c41c17868865d1f2e9e2ff4680b528da61d16af'
* commit '
5c41c17868865d1f2e9e2ff4680b528da61d16af':
Pass device characteristic information through to aapt.
Joe Onorato [Fri, 8 Oct 2010 21:01:50 +0000 (17:01 -0400)]
Revert "Enforce that PRODUCT_ variables aren't modified by module makefiles"
This reverts commit
95e743a6c02c9f9844cab95635b4954ecd82e7ff.
Ying Wang [Fri, 8 Oct 2010 01:57:57 +0000 (18:57 -0700)]
Integrate the slang "-MD" into the build system.
So that the header dependency can be included.
Bug:
2932230
Change-Id: I4d69870049157206ce2ab637ec6d673467db0c64
Ying Wang [Fri, 8 Oct 2010 16:36:57 +0000 (09:36 -0700)]
Merge ""Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function is in a system header file. If so, the function can be prefixed by "rs". Otherwise, "rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking."
Jean-Baptiste Queru [Sun, 26 Sep 2010 17:11:29 +0000 (10:11 -0700)]
ip-up-vpn doesn't need to be grandfathered any more
Change-Id: I8fb7f98ec253f95d5eccb2603c4e09db19be2742
Jean-Baptiste Queru [Fri, 8 Oct 2010 14:39:07 +0000 (07:39 -0700)]
Cherry-pick
547b902e
"am
d29f5df3: Merge "Add TTS language files to the full build." into gingerbread"
Change-Id: Iea988350124dacf085244addf34a6f216b58cf77
Jean-Baptiste Queru [Thu, 7 Oct 2010 22:00:12 +0000 (15:00 -0700)]
Cheryr-pick of
424de177
"resolved conflicts for merge of
0f085e5a to gingerbread-plus-aosp"
Change-Id: If2932eeb7a6f0420edf52ac343901afd68ce11fa
Shih-wei Liao [Fri, 8 Oct 2010 14:14:03 +0000 (07:14 -0700)]
"Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function
is in a system header file. If so, the function can be prefixed by "rs". Otherwise,
"rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking.
Change-Id: I8d5982cd6a75d465ffa6f98ca96941ae761117a2
Jean-Baptiste Queru [Thu, 7 Oct 2010 23:08:46 +0000 (16:08 -0700)]
Enforce that PRODUCT_ variables aren't modified by module makefiles
This eliminates one of the way a module could insert itself into
a build without going through a product definition file.
Change-Id: I1d537764d73c52ceaec96b64b6b6925e2f6a8d8e
Brian Muramatsu [Thu, 7 Oct 2010 22:48:15 +0000 (15:48 -0700)]
am
cd7170d7: resolved conflicts for merge of
0f8fcbe2 to gingerbread
Merge commit '
cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959' into gingerbread-plus-aosp
* commit '
cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959':
Support Additional CTS Host Jars
Jean-Baptiste Queru [Thu, 7 Oct 2010 22:48:02 +0000 (15:48 -0700)]
am
d29f5df3: Merge "Add TTS language files to the full build." into gingerbread
Merge commit '
d29f5df3663acb01f88347b67056d969e2d49d15' into gingerbread-plus-aosp
* commit '
d29f5df3663acb01f88347b67056d969e2d49d15':
Add TTS language files to the full build.
Ying Wang [Thu, 7 Oct 2010 22:24:44 +0000 (15:24 -0700)]
resolved conflicts for merge of
222a835d to master
Change-Id: I82b1f9338eadaed07dc803e56682f4bbb2a97fc3
Jean-Baptiste Queru [Thu, 7 Oct 2010 22:00:12 +0000 (15:00 -0700)]
resolved conflicts for merge of
0f085e5a to gingerbread-plus-aosp
Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7
Brian Muramatsu [Thu, 7 Oct 2010 21:31:21 +0000 (14:31 -0700)]
resolved conflicts for merge of
0f8fcbe2 to gingerbread
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
Jean-Baptiste Queru [Thu, 7 Oct 2010 21:26:31 +0000 (14:26 -0700)]
Merge "Add TTS language files to the full build." into gingerbread
Jean-Baptiste Queru [Thu, 7 Oct 2010 21:16:35 +0000 (14:16 -0700)]
Merge "Explicitly request ip-up-vpn"
Ying Wang [Thu, 7 Oct 2010 20:57:29 +0000 (13:57 -0700)]
am
83f69eb5: Prepend ccache to CC/CXX if necessary.
Merge commit '
83f69eb5f905d47581bed141b7f5103362390339' into gingerbread-plus-aosp
* commit '
83f69eb5f905d47581bed141b7f5103362390339':
Prepend ccache to CC/CXX if necessary.
Dima Zavin [Thu, 7 Oct 2010 20:57:24 +0000 (13:57 -0700)]
am
4477db78: CHERRY-PICK: propogate module tags for prebuilts
Merge commit '
4477db7883dfa21aa423f29057511fdb804c46af' into gingerbread-plus-aosp
* commit '
4477db7883dfa21aa423f29057511fdb804c46af':
CHERRY-PICK: propogate module tags for prebuilts
Brian Muramatsu [Thu, 7 Oct 2010 19:51:33 +0000 (12:51 -0700)]
Merge CTS-related change
Change-Id: I622b2647f075a8cefe82f0373e2f37b6ca7e6e4b
Ying Wang [Thu, 7 Oct 2010 17:45:02 +0000 (10:45 -0700)]
Prepend ccache to CC/CXX if necessary.
In case TARGET_CC is assigned with HOST_CC (eg, simulator build),
ccache will be prepended twice before this CL.
Bug:
3069576
Change-Id: I2ee44faea3a2795cf389ad6f80e4066a02b43be9
Dima Zavin [Thu, 16 Sep 2010 05:03:26 +0000 (22:03 -0700)]
CHERRY-PICK: propogate module tags for prebuilts
Change-Id: I08f1ae2ae4bb47a393cf5de1ed616d76fcd961c9
Signed-off-by: Dima Zavin <dima@android.com>
Joe Onorato [Thu, 7 Oct 2010 14:09:25 +0000 (07:09 -0700)]
am
700b88e1: Pass device characteristic information through to aapt.
Merge commit '
700b88e1451f216d137d8a356496bf51712512c6' into gingerbread-plus-aosp
* commit '
700b88e1451f216d137d8a356496bf51712512c6':
Pass device characteristic information through to aapt.
Stephen Hines [Wed, 6 Oct 2010 22:52:14 +0000 (15:52 -0700)]
Merge "Remove libclang* from user_tags.mk."
Stephen Hines [Wed, 6 Oct 2010 21:14:12 +0000 (14:14 -0700)]
Remove libclang* from user_tags.mk.
Change-Id: I428908bc6142b4c4c2e20bf7dbb86e61ff84734f
Jean-Baptiste Queru [Wed, 6 Oct 2010 15:05:44 +0000 (08:05 -0700)]
Add TTS language files to the full build.
Bug:
3065214
Change-Id: I5c324965e693fe26d686b92d869e33facc92c762
Joe Onorato [Tue, 5 Oct 2010 21:33:58 +0000 (17:33 -0400)]
Pass device characteristic information through to aapt.
A build configuration can define PRODUCT_CHARACTERISTICS, which is
a comma-separated list of device characteristics, for example
"nosdcard,grayscale". This will be passed through to aapt with
the --product flag.
Change-Id: I902c034b2f2824dbd2d33449308ee08beeb09551
Ying Wang [Wed, 6 Oct 2010 01:12:51 +0000 (18:12 -0700)]
am
476d70ae: Clean step for CL 71822
Merge commit '
476d70aece4395dc29288c3d647c64732d3a6d3d' into gingerbread-plus-aosp
* commit '
476d70aece4395dc29288c3d647c64732d3a6d3d':
Clean step for CL 71822
Ying Wang [Wed, 6 Oct 2010 01:07:29 +0000 (18:07 -0700)]
Clean step for CL 71822
Change-Id: Iddbefa915cdde0cc403134711b6ffd056c402db2
Brian Muramatsu [Thu, 2 Sep 2010 19:36:59 +0000 (12:36 -0700)]
Support Additional CTS Host Jars
Include another optional Makefile from the CTS project that
specifies additional JARs that the CTS host may need. This
will make it easier to create modules in the CTS project
that can be built for the host and device and shared between
the host and test cases.
The first such library will include annotations like
"RequiresFeature" and "SupportsProfile" that will be needed
to support multiple device profiles in CTS.
Another planned libraries could include defining the CTS
version number in a central spot and sharing code used to
probe for certain properties like the OpenGL version and
other system properties.
Can be checked in after this other change without causing
breakage: https://review.source.android.com/#change,16740
Change-Id: I3c488247b66522dc86277ab43198c34f790e0618
Romain Guy [Mon, 4 Oct 2010 23:56:11 +0000 (16:56 -0700)]
Add functions to press home, back and menu keys.
Change-Id: I54a28eb75463d5b5f8c9e2f216983aac67be0fa7
Ying Wang [Sun, 3 Oct 2010 03:10:59 +0000 (20:10 -0700)]
am
b7019e21: am
a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named.
Merge commit '
b7019e2147173a962febeab0e0693cdec9f80789'
* commit '
b7019e2147173a962febeab0e0693cdec9f80789':
Any intermediate targets between Progaurd and the built_dex should be differently named.
Ying Wang [Sun, 3 Oct 2010 03:08:55 +0000 (20:08 -0700)]
am
a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named.
Merge commit '
a9c381ed4517993175a5bb6741ecf2aac3e8040c' into gingerbread-plus-aosp
* commit '
a9c381ed4517993175a5bb6741ecf2aac3e8040c':
Any intermediate targets between Progaurd and the built_dex should be differently named.
Ying Wang [Sun, 3 Oct 2010 01:35:51 +0000 (18:35 -0700)]
Any intermediate targets between Progaurd and the built_dex should be differently named.
Change-Id: Ifb01b1fcf24ba0c5b98aa02dd604cd81918e1841
To do that, we have to move classes.jar step before proguard, so classes.jar is always with the full names.