OSDN Git Service
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.
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
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.
Ying Wang [Sat, 2 Oct 2010 00:07:29 +0000 (17:07 -0700)]
am
bf2ed191: am
a83940fa: Move odex related files to product-specific dir.
Merge commit '
bf2ed191fe229b6a83684c19a57e11e7b50c8637'
* commit '
bf2ed191fe229b6a83684c19a57e11e7b50c8637':
Move odex related files to product-specific dir.
Ying Wang [Fri, 1 Oct 2010 22:51:35 +0000 (15:51 -0700)]
am
a83940fa: Move odex related files to product-specific dir.
Merge commit '
a83940fa7851b35712e559be2246b56b5666b805' into gingerbread-plus-aosp
* commit '
a83940fa7851b35712e559be2246b56b5666b805':
Move odex related files to product-specific dir.
Ying Wang [Sat, 25 Sep 2010 01:09:04 +0000 (18:09 -0700)]
Move odex related files to product-specific dir.
For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar
and the .odex file, if dexpreopt is enabled.
These 2 files are moved to a product-specific dir in this change.
For target Java Libraries, $(intermediates) now points to the product-specific dir.
There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency.
Nothing is changed for host Java libraries.
Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
Brian Carlstrom [Fri, 1 Oct 2010 01:11:02 +0000 (18:11 -0700)]
am
bdb2e9f3: am
46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread
Merge commit '
bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13'
* commit '
bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13':
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Xavier Ducrohet [Thu, 30 Sep 2010 23:00:43 +0000 (16:00 -0700)]
am
b68b6b55: am
f51f24a6: Use the new sdk/build/tools.atree.
Merge commit '
b68b6b558b779f731613b5ebf6fe9090c319ce65'
* commit '
b68b6b558b779f731613b5ebf6fe9090c319ce65':
Use the new sdk/build/tools.atree.
Brian Carlstrom [Thu, 30 Sep 2010 22:02:49 +0000 (15:02 -0700)]
am
46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread
Merge commit '
46fc2341c535ba624fd2dceec9399ce681a80866' into gingerbread-plus-aosp
* commit '
46fc2341c535ba624fd2dceec9399ce681a80866':
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Brian Carlstrom [Thu, 30 Sep 2010 22:00:31 +0000 (15:00 -0700)]
Merge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into gingerbread
Brian Carlstrom [Thu, 30 Sep 2010 21:41:54 +0000 (14:41 -0700)]
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Change-Id: I8915bc1c9f52a3b6ab1a82b404ab61cd0726198d
Xavier Ducrohet [Thu, 30 Sep 2010 20:20:04 +0000 (13:20 -0700)]
am
f51f24a6: Use the new sdk/build/tools.atree.
Merge commit '
f51f24a6ea5d972dcaf60f882c26a0a08c9014fc' into gingerbread-plus-aosp
* commit '
f51f24a6ea5d972dcaf60f882c26a0a08c9014fc':
Use the new sdk/build/tools.atree.
Xavier Ducrohet [Mon, 27 Sep 2010 22:51:32 +0000 (15:51 -0700)]
Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.
Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.
Change-Id: I9158501cd68783d593e49e5fdea7f17d19b0120f
Ying Wang [Thu, 30 Sep 2010 18:27:04 +0000 (11:27 -0700)]
am
3c3bf677: am
0b9382c7: Separate out Proguard flag files to fix dependency.
Merge commit '
3c3bf6773ac7e2324c1d06282c625b81f799e427'
* commit '
3c3bf6773ac7e2324c1d06282c625b81f799e427':
Separate out Proguard flag files to fix dependency.
Xavier Ducrohet [Thu, 30 Sep 2010 18:26:59 +0000 (11:26 -0700)]
am
cbbab0d5: am
ffd5087e: Use the new sdk/build/tools.atree.
Merge commit '
cbbab0d57dfd297233b7fb52b30e0a95f3b0129e'
* commit '
cbbab0d57dfd297233b7fb52b30e0a95f3b0129e':
Use the new sdk/build/tools.atree.
Dan Bornstein [Thu, 30 Sep 2010 18:25:08 +0000 (11:25 -0700)]
am
a38198a5: am
c8c09e28: Inform dex-preopt when the target device is a uniprocessor.
Merge commit '
a38198a5f47d2679b476d29dce71d3f1ba17c892'
* commit '
a38198a5f47d2679b476d29dce71d3f1ba17c892':
Inform dex-preopt when the target device is a uniprocessor.
Ying Wang [Thu, 30 Sep 2010 16:31:38 +0000 (09:31 -0700)]
am
0b9382c7: Separate out Proguard flag files to fix dependency.
Merge commit '
0b9382c792c303a93f5805adf4eba377dac01950' into gingerbread-plus-aosp
* commit '
0b9382c792c303a93f5805adf4eba377dac01950':
Separate out Proguard flag files to fix dependency.
Xavier Ducrohet [Thu, 30 Sep 2010 15:52:16 +0000 (08:52 -0700)]
am
ffd5087e: Use the new sdk/build/tools.atree.
Merge commit '
ffd5087ec81a281b1299048b4282dad593ccd703' into gingerbread-plus-aosp
* commit '
ffd5087ec81a281b1299048b4282dad593ccd703':
Use the new sdk/build/tools.atree.
Ying Wang [Wed, 29 Sep 2010 21:50:41 +0000 (14:50 -0700)]
Separate out Proguard flag files to fix dependency.
Bug:
3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
Dan Bornstein [Wed, 29 Sep 2010 19:53:24 +0000 (12:53 -0700)]
am
c8c09e28: Inform dex-preopt when the target device is a uniprocessor.
Merge commit '
c8c09e285d59f73334267deb9502c0927c616837' into gingerbread-plus-aosp
* commit '
c8c09e285d59f73334267deb9502c0927c616837':
Inform dex-preopt when the target device is a uniprocessor.
Dan Bornstein [Wed, 29 Sep 2010 18:54:15 +0000 (11:54 -0700)]
Inform dex-preopt when the target device is a uniprocessor.
By default, dex-preopt optimizes for an SMP target.
Change-Id: Ib92552e55f5426b9b035ce862233752af090bb43
Brian Carlstrom [Wed, 29 Sep 2010 01:21:48 +0000 (18:21 -0700)]
am
73143d9d: am
ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit '
73143d9dfcaca5416d46be2733bb370824b3acb2'
* commit '
73143d9dfcaca5416d46be2733bb370824b3acb2':
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Ying Wang [Wed, 29 Sep 2010 01:21:39 +0000 (18:21 -0700)]
am
e52fddec: am
879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread
Merge commit '
e52fddec86a808b98bcdd033704b43a83cf569ea'
* commit '
e52fddec86a808b98bcdd033704b43a83cf569ea':
framework-res is not used as regular Java library now.
Brian Carlstrom [Wed, 29 Sep 2010 00:50:49 +0000 (17:50 -0700)]
am
ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit '
ea83daa389aea493294617232b5c34414861d701' into gingerbread-plus-aosp
* commit '
ea83daa389aea493294617232b5c34414861d701':
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Brian Carlstrom [Wed, 29 Sep 2010 00:45:59 +0000 (17:45 -0700)]
Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Dianne Hackborn [Wed, 29 Sep 2010 00:40:09 +0000 (17:40 -0700)]
am
3367df34: am
2f85f654: Merge "Add location shared library to core build." into gingerbread
Merge commit '
3367df348cb8b3bd6f6ff834d5cbfebfaf20e444'
* commit '
3367df348cb8b3bd6f6ff834d5cbfebfaf20e444':
Add location shared library to core build.
Ying Wang [Wed, 29 Sep 2010 00:39:46 +0000 (17:39 -0700)]
am
c292927f: am
e1926260: Treat prebuilt SDKs and the stub as normal java libraries.
Merge commit '
c292927f05ff6955b1e5ffe40b8b9777328eba55'
* commit '
c292927f05ff6955b1e5ffe40b8b9777328eba55':
Treat prebuilt SDKs and the stub as normal java libraries.
Ying Wang [Wed, 29 Sep 2010 00:36:46 +0000 (17:36 -0700)]
am
879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread
Merge commit '
879779a5806d6e09d1c852a93dd4e1793bbd96cd' into gingerbread-plus-aosp
* commit '
879779a5806d6e09d1c852a93dd4e1793bbd96cd':
framework-res is not used as regular Java library now.
Ying Wang [Wed, 29 Sep 2010 00:32:36 +0000 (17:32 -0700)]
Merge "framework-res is not used as regular Java library now." into gingerbread
Ying Wang [Wed, 29 Sep 2010 00:27:56 +0000 (17:27 -0700)]
framework-res is not used as regular Java library now.
Change-Id: Ic2b8f7d7bceab3be7884eb4a7dbe721c14bd1ccb
Dianne Hackborn [Wed, 29 Sep 2010 00:19:25 +0000 (17:19 -0700)]
am
2f85f654: Merge "Add location shared library to core build." into gingerbread
Merge commit '
2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp
* commit '
2f85f654eea8255ee4acd7230e4f72fc2cdaacb5':
Add location shared library to core build.
Dianne Hackborn [Wed, 29 Sep 2010 00:14:39 +0000 (17:14 -0700)]
Merge "Add location shared library to core build." into gingerbread
Ying Wang [Tue, 28 Sep 2010 23:25:15 +0000 (16:25 -0700)]
am
e1926260: Treat prebuilt SDKs and the stub as normal java libraries.
Merge commit '
e1926260486707b3941b5488e97307f7904d1c99' into gingerbread-plus-aosp
* commit '
e1926260486707b3941b5488e97307f7904d1c99':
Treat prebuilt SDKs and the stub as normal java libraries.
Ying Wang [Tue, 28 Sep 2010 23:18:03 +0000 (16:18 -0700)]
Treat prebuilt SDKs and the stub as normal java libraries.
Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
Dianne Hackborn [Tue, 28 Sep 2010 21:25:05 +0000 (14:25 -0700)]
Add location shared library to core build.
Change-Id: I3ea62e2fb29611337044d4c3c10f756fb5d35f43
Brian Carlstrom [Fri, 17 Sep 2010 19:25:50 +0000 (12:25 -0700)]
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Change-Id: I3dfc1aa6f10a52c2adc68259ce1cedec2ffd8f0e
Ying Wang [Tue, 28 Sep 2010 17:45:54 +0000 (10:45 -0700)]
resolved conflicts for merge of
18c00c5c to master
Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
Brett Chabot [Tue, 28 Sep 2010 16:27:26 +0000 (09:27 -0700)]
am
8e07b84f: am
ef5fd0e1: Merge "Package ddmlib-prebuilt with CTS." into gingerbread
Merge commit '
8e07b84fccc1c5d7ed3c5c05b922fcb50e683c18'
* commit '
8e07b84fccc1c5d7ed3c5c05b922fcb50e683c18':
Package ddmlib-prebuilt with CTS.
Jean-Baptiste Queru [Tue, 28 Sep 2010 14:20:52 +0000 (07:20 -0700)]
resolved conflicts for merge of
9bfa95cf to master
Change-Id: I70cfcd1de8a9d56900f81c174e33e433bae0508d
Ying Wang [Tue, 28 Sep 2010 04:28:20 +0000 (21:28 -0700)]
am
81fcba10: am
1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '
81fcba102ea3953f525c1659914247747637ae7d'
* commit '
81fcba102ea3953f525c1659914247747637ae7d':
Don't set DISABLE_DEXPREOPT in lunch.
Ying Wang [Tue, 28 Sep 2010 04:02:50 +0000 (21:02 -0700)]
am
b09173e7: am
30090e41: Set the intermediate dirs before using them.
Merge commit '
b09173e78936f65a7f128fda2383f9ed5abce2e0'
* commit '
b09173e78936f65a7f128fda2383f9ed5abce2e0':
Set the intermediate dirs before using them.
Ying Wang [Tue, 28 Sep 2010 03:33:29 +0000 (20:33 -0700)]
am
5cb94751: am
9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Merge commit '
5cb94751d7b3b6b92d07680bc0e7703f931e385b'
* commit '
5cb94751d7b3b6b92d07680bc0e7703f931e385b':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Ying Wang [Tue, 28 Sep 2010 01:05:22 +0000 (18:05 -0700)]
am
bb2b82bd: Merge "Fix userdata partition\'s ext4 mount point to data." into gingerbread
Merge commit '
bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp
* commit '
bb2b82bd557b157fea5e280ef50ee782d15ac032':
Fix userdata partition's ext4 mount point to data.
Ying Wang [Tue, 28 Sep 2010 01:03:52 +0000 (18:03 -0700)]
Merge "Fix userdata partition's ext4 mount point to data." into gingerbread
Brett Chabot [Tue, 28 Sep 2010 00:49:46 +0000 (17:49 -0700)]
am
ef5fd0e1: Merge "Package ddmlib-prebuilt with CTS." into gingerbread
Merge commit '
ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2' into gingerbread-plus-aosp
* commit '
ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2':
Package ddmlib-prebuilt with CTS.
Ying Wang [Tue, 28 Sep 2010 00:49:03 +0000 (17:49 -0700)]
Fix userdata partition's ext4 mount point to data.
Bug:
3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
Brett Chabot [Tue, 28 Sep 2010 00:47:55 +0000 (17:47 -0700)]
Merge "Package ddmlib-prebuilt with CTS." into gingerbread
Dima Zavin [Tue, 28 Sep 2010 00:37:17 +0000 (17:37 -0700)]
core: Make fake packages have real installed files for proper dependencies
Change-Id: I3145440eea0fbbd8ba22a2b3b0511f4c18f90eca
Signed-off-by: Dima Zavin <dima@android.com>
Xavier Ducrohet [Wed, 28 Jul 2010 18:07:31 +0000 (11:07 -0700)]
Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:28:24 +0000 (17:28 -0700)]
am
6bc232a1: Merge "Don\'t reference CarHome and CarHomeLauncher" into gingerbread
Merge commit '
6bc232a11621740d14f517218d2599a714fb451f' into gingerbread-plus-aosp
* commit '
6bc232a11621740d14f517218d2599a714fb451f':
Don't reference CarHome and CarHomeLauncher
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:24:02 +0000 (17:24 -0700)]
Merge "Don't reference CarHome and CarHomeLauncher" into gingerbread
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:04:41 +0000 (17:04 -0700)]
Don't reference CarHome and CarHomeLauncher
They're not actually part of AOSP
Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
Ying Wang [Mon, 27 Sep 2010 23:33:43 +0000 (16:33 -0700)]
am
1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '
1fdbf261a0d550baaed96f5461bb014754364c16' into gingerbread-plus-aosp
* commit '
1fdbf261a0d550baaed96f5461bb014754364c16':
Don't set DISABLE_DEXPREOPT in lunch.
Ying Wang [Mon, 27 Sep 2010 23:25:11 +0000 (16:25 -0700)]
Don't set DISABLE_DEXPREOPT in lunch.
Because in core/main.mk WITH_DEXPREOPT is set to true only if the build OS is linux.
Change-Id: I287ab61312667f6100371d07010bcab5cfcc7e17
Xavier Ducrohet [Mon, 27 Sep 2010 22:51:32 +0000 (15:51 -0700)]
Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.
Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.
Change-Id: Ia0b0ea37f8a4904b3a7f7805a552eeb499a2c0ee
Jean-Baptiste Queru [Sun, 26 Sep 2010 22:54:18 +0000 (15:54 -0700)]
Explicitly handle bluetooth files.
This also allows to separate smartphone and nonsmartphone variants.
Change-Id: Icbd7c78a866bae32f060607f8a898d59fcd45830
Ying Wang [Mon, 27 Sep 2010 21:59:13 +0000 (14:59 -0700)]
am
30090e41: Set the intermediate dirs before using them.
Merge commit '
30090e41e31e7db34a1092d8173c1413c036b49d' into gingerbread-plus-aosp
* commit '
30090e41e31e7db34a1092d8173c1413c036b49d':
Set the intermediate dirs before using them.
Ying Wang [Mon, 27 Sep 2010 21:53:39 +0000 (14:53 -0700)]
Set the intermediate dirs before using them.
Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
Ying Wang [Mon, 27 Sep 2010 21:10:53 +0000 (14:10 -0700)]
am
9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Merge commit '
9049e321aec53cfb23b63bbee7c21878a087350f' into gingerbread-plus-aosp
* commit '
9049e321aec53cfb23b63bbee7c21878a087350f':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Ying Wang [Mon, 27 Sep 2010 21:07:17 +0000 (14:07 -0700)]
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
So the its target-specific PRIVATE vars can be set properly.
Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
Ying Wang [Mon, 27 Sep 2010 19:05:56 +0000 (12:05 -0700)]
resolved conflicts for merge of
dc45f86a to master
Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe