OSDN Git Service
The Android Automerger [Thu, 4 Nov 2010 07:04:27 +0000 (00:04 -0700)]
GRH35
Change-Id: If31ec945f7180a6ec895ed60dba8813b0cd654cd
The Android Automerger [Wed, 3 Nov 2010 09:52:33 +0000 (02:52 -0700)]
GRH34
Change-Id: I663acf81dfceaea5a0d9f7b814ae85f07c402582
The Android Automerger [Tue, 2 Nov 2010 05:40:37 +0000 (22:40 -0700)]
GRH32
Change-Id: If18a69659ee4aa8772cd1b0132bea7acc3615b5f
The Android Automerger [Tue, 2 Nov 2010 05:40:23 +0000 (22:40 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Mon, 1 Nov 2010 22:51:49 +0000 (15:51 -0700)]
docs: make the resizable side nav standard. DO NOT MERGE.
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
Scott Main [Mon, 1 Nov 2010 17:49:07 +0000 (10:49 -0700)]
Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
The Android Automerger [Sat, 30 Oct 2010 04:37:53 +0000 (21:37 -0700)]
GRH29
Change-Id: Ib4c410b7fe0c81cc16280969284b8437a3235d46
The Android Automerger [Sat, 30 Oct 2010 04:37:37 +0000 (21:37 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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
android-build SharedAccount [Fri, 29 Oct 2010 04:50:05 +0000 (21:50 -0700)]
GRH28C
Change-Id: I584d860269afb63429295f9b4bf18ba5ba54c478
The Android Automerger [Fri, 29 Oct 2010 03:23:39 +0000 (20:23 -0700)]
GRH28B
Change-Id: Id49448f70e70e3acca906867c17ce3d5720fa888
The Android Automerger [Thu, 28 Oct 2010 19:25:47 +0000 (12:25 -0700)]
GRH28
Change-Id: I5665c46137ab31f0b753cc01cb03663e9d391cc5
The Android Automerger [Thu, 28 Oct 2010 19:25:34 +0000 (12:25 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Thu, 28 Oct 2010 05:35:24 +0000 (22:35 -0700)]
docs: update sdk download template DO NOT MERGE
add windows installer and revise a bit else
Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
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
The Android Automerger [Wed, 27 Oct 2010 05:23:20 +0000 (22:23 -0700)]
GRH26B
Change-Id: Ibfcf3bee4b46416b37f7a26af81810e00b177a89
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
The Android Automerger [Wed, 27 Oct 2010 00:11:43 +0000 (17:11 -0700)]
GRH26
Change-Id: I1e461e91ee633830081082363d1eb6f45dc14275
The Android Automerger [Tue, 26 Oct 2010 04:22:00 +0000 (21:22 -0700)]
GRH25B
Change-Id: I6be54e4cd9d9e138d234702829e69c7149e3529e
The Android Automerger [Tue, 26 Oct 2010 04:21:35 +0000 (21:21 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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
The Android Automerger [Mon, 25 Oct 2010 18:28:28 +0000 (11:28 -0700)]
GRH25
Change-Id: I8968fa320a3721d25a0e7a6b313edb3d92f9588b
The Android Automerger [Mon, 25 Oct 2010 01:56:36 +0000 (18:56 -0700)]
GRH24
Change-Id: I824b0de10d0738af056580386ed55b24975e78ce
android-build SharedAccount [Sat, 23 Oct 2010 00:19:33 +0000 (17:19 -0700)]
GRH22B
Change-Id: I73e460342961c8e75be6bf765a9fa914ac3148b5
The Android Automerger [Sat, 23 Oct 2010 00:06:05 +0000 (17:06 -0700)]
GRH22
Change-Id: I4b0488beb96d816cb8ebc63e00832cae13411188
android-build SharedAccount [Fri, 22 Oct 2010 21:53:19 +0000 (14:53 -0700)]
GRH21B
Change-Id: Ib1ce8e055c6b8cea331409a12abd3ff663483c96
The Android Automerger [Thu, 21 Oct 2010 14:24:20 +0000 (07:24 -0700)]
GRH21
Change-Id: I1646227a3efed4bcbd3f5d0d5c5dc52116f04c15
The Android Automerger [Thu, 21 Oct 2010 14:24:08 +0000 (07:24 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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
The Android Automerger [Wed, 20 Oct 2010 19:46:44 +0000 (12:46 -0700)]
GRH20B
Change-Id: Ibc76f92280bb5db2013b6dccf8d85024e10c0ba1
The Android Automerger [Wed, 20 Oct 2010 14:29:49 +0000 (07:29 -0700)]
GRH20
Change-Id: Ic28dc803759054f0a7d940e5039feb9562a38377
The Android Automerger [Tue, 19 Oct 2010 14:40:55 +0000 (07:40 -0700)]
GRH19
Change-Id: Ib99ea6f431606918d42a1cf26ab3c8f22ee118c6
android-build SharedAccount [Tue, 19 Oct 2010 00:38:59 +0000 (17:38 -0700)]
GRH18C
Change-Id: I8a348d98633a0958c2cb86d82de527d5fc51c8d7
android-build SharedAccount [Tue, 19 Oct 2010 00:25:04 +0000 (17:25 -0700)]
GRH18B
Change-Id: I92fa1ad11ef1b938780512ef198b13361f5bb0c1
The Android Automerger [Tue, 19 Oct 2010 00:20:23 +0000 (17:20 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Dianne Hackborn [Mon, 18 Oct 2010 18:46:50 +0000 (11:46 -0700)]
Gingerbread becomes real.
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
The Android Automerger [Mon, 18 Oct 2010 15:28:46 +0000 (08:28 -0700)]
GRH18
Change-Id: I76e1c8a71873e477057eea7ce684afa3ed09a08f
The Android Automerger [Mon, 18 Oct 2010 15:27:58 +0000 (08:27 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Sat, 16 Oct 2010 00:00:17 +0000 (17:00 -0700)]
GRH15C
Change-Id: Id3dff242dec3ebf8c4bb4f39729323f489915603
android-build SharedAccount [Fri, 15 Oct 2010 21:39:29 +0000 (14:39 -0700)]
GRH15B
Change-Id: Ic7f79b482f69e5db29d087587316dc076494f3fe
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
The Android Automerger [Fri, 15 Oct 2010 16:07:17 +0000 (09:07 -0700)]
GRH15
Change-Id: Id3f7d7cc4542dc131cef21f0f7928e3ab51221a1
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>
The Android Automerger [Thu, 14 Oct 2010 19:57:02 +0000 (12:57 -0700)]
GRH14B
Change-Id: Icdde5d0dde16bc95fd54b1b01d785b151f5ee710
The Android Automerger [Thu, 14 Oct 2010 19:55:29 +0000 (12:55 -0700)]
GRH14
Change-Id: I1668fd8ecf94a8b89d63f4478cbcb664a153b659
The Android Automerger [Thu, 14 Oct 2010 01:50:03 +0000 (18:50 -0700)]
GRH13B
Change-Id: I79a455005d01ae300558074d1aa818bfbc61a6e3
The Android Automerger [Thu, 14 Oct 2010 01:49:56 +0000 (18:49 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Xavier Ducrohet [Thu, 14 Oct 2010 00:26:29 +0000 (17:26 -0700)]
Add SystemUI (notification bar) to SDK build.
Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0
The Android Automerger [Wed, 13 Oct 2010 14:03:33 +0000 (07:03 -0700)]
GRH13
Change-Id: Idf194606c0a6227a571e4f1a28b61cf20ae04975
android-build SharedAccount [Tue, 12 Oct 2010 14:46:00 +0000 (07:46 -0700)]
GRH12
Change-Id: Ib999acd328ce6d495ef8f742d7ca4200672d0ef6
android-build SharedAccount [Mon, 11 Oct 2010 23:40:41 +0000 (16:40 -0700)]
GRH11B
Change-Id: I8472a27d437c477e6ae6bd3e740392f933e19938
The Android Automerger [Mon, 11 Oct 2010 14:16:06 +0000 (07:16 -0700)]
GRH11
Change-Id: I50696e1322860f649c8357c97fede7b68519ab10
The Android Automerger [Sun, 10 Oct 2010 23:37:31 +0000 (16:37 -0700)]
GRH10
Change-Id: If9aa7efe7cfb0c1c2591779eed4ddf1be6f53a6f
The Android Automerger [Sun, 10 Oct 2010 23:36:34 +0000 (16:36 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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
The Android Automerger [Sat, 9 Oct 2010 00:15:42 +0000 (17:15 -0700)]
GRH08B
Change-Id: I22675409218d41de3f9c0900ee77dafa7d955198
The Android Automerger [Fri, 8 Oct 2010 16:06:02 +0000 (09:06 -0700)]
GRH08
Change-Id: I069f06318d2ff0d49c6bb87e37500d15959c44f2
The Android Automerger [Fri, 8 Oct 2010 16:05:55 +0000 (09:05 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Thu, 7 Oct 2010 23:02:24 +0000 (16:02 -0700)]
GRH07B
Change-Id: I7b5774acb0b1f0360d98dcd411141fb37ff48eb2
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
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>
The Android Automerger [Thu, 7 Oct 2010 14:12:39 +0000 (07:12 -0700)]
GRH07
Change-Id: I7dcfb737fdd789aaa0e27d1ca1e32bac871934ae
The Android Automerger [Thu, 7 Oct 2010 02:17:40 +0000 (19:17 -0700)]
GRH06B
Change-Id: Icae81c436b61ae341433554b596a0b0f22363d3c
The Android Automerger [Thu, 7 Oct 2010 02:17:26 +0000 (19:17 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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
The Android Automerger [Wed, 6 Oct 2010 14:49:42 +0000 (07:49 -0700)]
GRH06
Change-Id: I3a713bf9d04620f6aaa14934bb6824b575b87732
The Android Automerger [Wed, 6 Oct 2010 14:45:04 +0000 (07:45 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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: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
android-build SharedAccount [Tue, 5 Oct 2010 16:02:55 +0000 (09:02 -0700)]
GRH05B
Change-Id: Ibd2252d06876fa5dfb1c11be1dba0da89976df20
The Android Automerger [Tue, 5 Oct 2010 14:13:24 +0000 (07:13 -0700)]
GRH05
Change-Id: I07bbbe0ac217165f8562e621dc06435f799264e6
android-build SharedAccount [Mon, 4 Oct 2010 22:22:30 +0000 (15:22 -0700)]
GRH04B
Change-Id: I3489a30b61367cda3cd5723e1721e7e3dc5012df
The Android Automerger [Mon, 4 Oct 2010 14:14:29 +0000 (07:14 -0700)]
GRH04
Change-Id: I9a620f65872d3773c7c5fbf110c1cff9d1535eca
The Android Automerger [Mon, 4 Oct 2010 14:13:18 +0000 (07:13 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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.
android-build SharedAccount [Fri, 1 Oct 2010 22:56:46 +0000 (15:56 -0700)]
GRH01B
Change-Id: Id30665e572fa75051a0894d369bfb45be963a4dc
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
The Android Automerger [Fri, 1 Oct 2010 14:18:12 +0000 (07:18 -0700)]
GRH01
Change-Id: If100c337665eb374089765d744da282c758f6d78
The Android Automerger [Fri, 1 Oct 2010 14:17:15 +0000 (07:17 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Thu, 30 Sep 2010 23:03:21 +0000 (16:03 -0700)]
GRG92B
Change-Id: Ibbe42b603d25775b1c76bb49caadf3f092ae0246
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 [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
The Android Automerger [Thu, 30 Sep 2010 14:11:12 +0000 (07:11 -0700)]
GRG92
Change-Id: Ic64eabc22bd3a0a33bf7a0bce798ebfc8a4a59ec
The Android Automerger [Thu, 30 Sep 2010 14:10:56 +0000 (07:10 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Thu, 30 Sep 2010 01:43:04 +0000 (18:43 -0700)]
GRG91B
Change-Id: Ifccdf3b3657b7c0c6d58684cb211d1d7712205ab
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 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
The Android Automerger [Wed, 29 Sep 2010 14:13:50 +0000 (07:13 -0700)]
GRG91
Change-Id: I7f6db3e3ecde47256d2c0f03f228077fd3b904fd
The Android Automerger [Wed, 29 Sep 2010 14:12:33 +0000 (07:12 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Wed, 29 Sep 2010 01:52:04 +0000 (18:52 -0700)]
GRG90C
Change-Id: Ic75a0917b4bd1790695ec8bf61d33bfba0c5c195
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
OSDN Git Service
