OSDN Git Service
Raphael Moll [Sat, 30 Oct 2010 02:03:49 +0000 (19:03 -0700)]
am
4aa7a190: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
* commit '
4aa7a190bb81b7e3ad12d53b83908c3c72745f6e':
Fix "make acp" under Cygwin. DO NOT MERGE.
Raphael Moll [Sat, 30 Oct 2010 01:53:07 +0000 (18:53 -0700)]
Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
Jean-Baptiste Queru [Fri, 29 Oct 2010 15:16:49 +0000 (08:16 -0700)]
am
6a514dcc: am
16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '
6a514dcc9d7d851d5cbe95ef7603d2bf0523a6a2':
CTS vm-tests now depend on hosttestlib.
Jean-Baptiste Queru [Fri, 29 Oct 2010 12:51:54 +0000 (05:51 -0700)]
am
16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '
16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4':
CTS vm-tests now depend on hosttestlib.
Jean-Baptiste Queru [Fri, 29 Oct 2010 12:45:56 +0000 (05:45 -0700)]
Merge from AOSP froyo. Do not merge.
CTS vm-tests now depend on hosttestlib.
Change-Id: Ie252227825ccb843b4be1205e3b135b7535b8a03
Raphael Moll [Thu, 28 Oct 2010 02:06:12 +0000 (19:06 -0700)]
Fix "make acp" under Cygwin. DO NOT MERGE.
Change-Id: I52ae8d4835b27a712d4795e7f41fa9ca4f3a822d
Brett Chabot [Thu, 28 Oct 2010 01:56:53 +0000 (18:56 -0700)]
am
ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
Brett Chabot [Thu, 28 Oct 2010 01:49:33 +0000 (18:49 -0700)]
cherry pick 'CTS vm-tests depend on hostestlib' into GB.
Original description:
CTS vm-tests now depend on hosttestlib.
Bug
3125713
Conflicts:
core/tasks/cts.mk
Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
Jean-Baptiste Queru [Wed, 27 Oct 2010 21:59:39 +0000 (14:59 -0700)]
Merge "CTS vm-tests now depend on hosttestlib." into froyo
Brett Chabot [Wed, 27 Oct 2010 01:55:56 +0000 (18:55 -0700)]
CTS vm-tests now depend on hosttestlib.
Bug
3125713
Change-Id: I5774df2abeff7dd82e1218138d1ea3b25edd0901
Scott Main [Tue, 26 Oct 2010 00:22:50 +0000 (17:22 -0700)]
am
9d32bd5b: docs: css tweak to Ps in sidebox. DO NOT MERGE.
Merge commit '
9d32bd5b03c92e9220ff6cca029a587f5f3c754c' into gingerbread-plus-aosp
* commit '
9d32bd5b03c92e9220ff6cca029a587f5f3c754c':
docs: css tweak to Ps in sidebox. DO NOT MERGE.
Scott Main [Tue, 26 Oct 2010 00:14:24 +0000 (17:14 -0700)]
docs: css tweak to Ps in sidebox. DO NOT MERGE.
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
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 [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 [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 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: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 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 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
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 [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 [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.
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
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
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."
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
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
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
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.
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.
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
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 [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 [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 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 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
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 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
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
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 18:52:45 +0000 (11:52 -0700)]
am
02352378: Remove emulator-based dexpreopt logic from the build system.
Merge commit '
0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp
* commit '
0235237805991b48831dc8add072a50c478b2fcb':
Remove emulator-based dexpreopt logic from the build system.