OSDN Git Service
The Android Automerger [Fri, 1 Feb 2013 15:10:13 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Ying Wang [Thu, 31 Jan 2013 19:16:57 +0000 (11:16 -0800)]
Resurrect generic_armv5
But only for unbundled build.
Add it to tapas arch options.
Bug:
8108463
Change-Id: I53cd63c6ab2113fee3992650b561658231ea9921
The Android Automerger [Thu, 31 Jan 2013 15:11:48 +0000 (07:11 -0800)]
JWQ31
The Android Automerger [Thu, 31 Jan 2013 15:10:11 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Ying Wang [Wed, 30 Jan 2013 22:43:05 +0000 (14:43 -0800)]
Check build even if a module it's built against SDK.
Change-Id: I2466620e52541bb938721772ce9f63c12bc212db
Ying Wang [Wed, 30 Jan 2013 19:22:06 +0000 (11:22 -0800)]
Refactor calculation LOCAL_CHECKED_MODULE
To remove dup code;
Also added two more umbrella targets: host, target.
Change-Id: Ia6deed2940a26a31ad823fe54816840861f3fb72
Ying Wang [Wed, 30 Jan 2013 20:44:49 +0000 (20:44 +0000)]
Revert "Refactor calculation LOCAL_CHECKED_MODULE"
This reverts commit
ba99e69424b72ac95581da50c8eea131d398d790
Change-Id: I3c42dea56376d26a5bb77b4944ae17a6875aadbb
Ying Wang [Wed, 30 Jan 2013 19:22:06 +0000 (11:22 -0800)]
Refactor calculation LOCAL_CHECKED_MODULE
To remove dup code;
Also added two more umbrella targets: host, target.
Change-Id: Ic82db571435cdbd10fd9e70e6c4195f4ca9ecd99
The Android Automerger [Wed, 30 Jan 2013 19:07:53 +0000 (11:07 -0800)]
JWQ30B
Ying Wang [Wed, 30 Jan 2013 18:25:38 +0000 (10:25 -0800)]
Don't fall back to host $(CC) if the target gcc is not checked out
Error "cc1plus: error: unrecognized command line option
‘-mfloat-abi=softfp’" is much more confusing than
"...gcc: No such file or directory".
Also we don't build in Windows/Cygwin any more so we don't need the old
trick.
Change-Id: Ibbe3da67b412575e56bd6e61ef412ea5b2789fea
Ying Wang [Wed, 30 Jan 2013 17:56:12 +0000 (17:56 +0000)]
Merge "Umbrella build targets to help engineers verify build"
The Android Automerger [Wed, 30 Jan 2013 15:11:40 +0000 (07:11 -0800)]
JWQ30
The Android Automerger [Wed, 30 Jan 2013 15:10:16 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Ying Wang [Wed, 30 Jan 2013 00:59:18 +0000 (16:59 -0800)]
Umbrella build targets to help engineers verify build
With this change, by choosing the right build target, you can reduce
significant verification build time:
If you are working on the framework, "make target-java" sounds enough;
if you are working on native target code, "make target-native" saves
your time by not building the Java code.
This will help reduce uncaught breakges for by default not everything
is built now.
Change-Id: I5a7c82d3f6372db03bea76155c8d6cc63d988eae
The Android Automerger [Wed, 30 Jan 2013 00:52:22 +0000 (16:52 -0800)]
JWQ29B
Elliott Hughes [Tue, 29 Jan 2013 21:52:05 +0000 (13:52 -0800)]
am
5fb282d8: am
6463953e: am
b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
# Via Android Git Automerger (2) and others
* commit '
5fb282d89d00504772753acf1af63c5b422d21e2':
Remove HAVE_DLADDR from AndroidConfig.h.
Elliott Hughes [Tue, 29 Jan 2013 21:49:55 +0000 (13:49 -0800)]
am
6463953e: am
b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
# Via Android Git Automerger (1) and others
* commit '
6463953e169bbd559cada7263be363202ed40d02':
Remove HAVE_DLADDR from AndroidConfig.h.
Elliott Hughes [Tue, 29 Jan 2013 21:47:14 +0000 (13:47 -0800)]
am
b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
b796ce353d114328cc16a1f2ad2b1059b03a0c52':
Remove HAVE_DLADDR from AndroidConfig.h.
Elliott Hughes [Tue, 29 Jan 2013 21:28:58 +0000 (21:28 +0000)]
Merge "Remove HAVE_DLADDR from AndroidConfig.h."
Simon Wilson [Tue, 29 Jan 2013 20:03:58 +0000 (20:03 +0000)]
Merge "Add audio-route to pathmap.mk"
The Android Automerger [Tue, 29 Jan 2013 15:11:58 +0000 (07:11 -0800)]
JWQ29
The Android Automerger [Tue, 29 Jan 2013 15:10:11 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Ying Wang [Tue, 29 Jan 2013 03:26:02 +0000 (03:26 +0000)]
Merge "No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR."
Ying Wang [Tue, 29 Jan 2013 03:19:13 +0000 (19:19 -0800)]
No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR.
This removes unnecessary dependency if there is no
LOCAL_DROIDDOC_HTML_DIR.
Change-Id: If9e06b6e478a9cd61f5441aa376d996857ee2fb5
Wink Saville [Tue, 29 Jan 2013 03:11:04 +0000 (03:11 +0000)]
Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"
-b master [Thu, 24 Jan 2013 00:54:32 +0000 (16:54 -0800)]
Build libcore without a dep on aapt.
Currently building libcore (i.e. to get the core Java libraries) has a
dependency on AAPT. This is problematic for some users that don't want to pull
in the entirety of frameworks/base, e.g. for Dalvik development.
It turns out that all definitions.mk is using aapt for in this case is 'aapt
add -k <jar> <dex>', which adds a file to a JAR while stripping path info.
This is functionally equivalent to 'zip -j', and this CL just makes that
switch.
Change-Id: I292ecaf9d0321018bb7d2e68a49b2cc81de98a20
Wink Saville [Mon, 28 Jan 2013 23:30:58 +0000 (15:30 -0800)]
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
Add voip-common to various files so that its available when booting
and building. Basically everyplace telephony and mms-common where needed
voip-common was added.
In core/pathmap.mk voip is removed as it is no longer in frameworks/base.
Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
Ying Wang [Mon, 28 Jan 2013 19:39:39 +0000 (11:39 -0800)]
am
46fa45ad: am
cf0a9042: am
9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Android Git Automerger (2) and others
* commit '
46fa45ad76ff63978bd35a07aa5e1d743657bf55':
Use += to append to target-specific PRIVATE_CLEAN_FILES
Ying Wang [Mon, 28 Jan 2013 19:36:51 +0000 (11:36 -0800)]
am
cf0a9042: am
9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Android Git Automerger (1) and others
* commit '
cf0a90426ad969bd2deb66b0c23079842b6c4fa2':
Use += to append to target-specific PRIVATE_CLEAN_FILES
Ying Wang [Mon, 28 Jan 2013 19:34:56 +0000 (11:34 -0800)]
am
9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Gerrit Code Review (1) and Ying Wang (1)
* commit '
9e808ff70515479458d39abfd64ed11eb55fefbb':
Use += to append to target-specific PRIVATE_CLEAN_FILES
Ying Wang [Mon, 28 Jan 2013 19:05:29 +0000 (19:05 +0000)]
Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
Ying Wang [Mon, 28 Jan 2013 18:58:01 +0000 (10:58 -0800)]
Use += to append to target-specific PRIVATE_CLEAN_FILES
Instead of incorrectly including global variable PRIVATE_CLEAN_FILES
Change-Id: I9b5e12448dad5001de051a566d8a94a89b20ecac
The Android Automerger [Mon, 28 Jan 2013 15:11:14 +0000 (07:11 -0800)]
JWQ28
The Android Automerger [Mon, 28 Jan 2013 15:10:07 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Elliott Hughes [Fri, 25 Jan 2013 23:57:40 +0000 (15:57 -0800)]
Remove HAVE_DLADDR from AndroidConfig.h.
Change-Id: I014ce98c61b12169e381b769af34b682df46087e
Stephen Hines [Fri, 25 Jan 2013 23:26:16 +0000 (15:26 -0800)]
Remove references to llvm-rs-link, which is unused.
Change-Id: I42433a9b1d2b525d1b09f778a10ab9689e34926e
The Android Automerger [Fri, 25 Jan 2013 15:11:10 +0000 (07:11 -0800)]
JWQ25
The Android Automerger [Fri, 25 Jan 2013 15:10:05 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
The Android Automerger [Fri, 25 Jan 2013 00:20:50 +0000 (16:20 -0800)]
JWQ24B
The Android Automerger [Thu, 24 Jan 2013 15:11:33 +0000 (07:11 -0800)]
JWQ24
The Android Automerger [Thu, 24 Jan 2013 15:10:06 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
The Android Automerger [Thu, 24 Jan 2013 00:15:14 +0000 (16:15 -0800)]
JWQ23B
Stephen Hines [Wed, 23 Jan 2013 18:39:05 +0000 (18:39 +0000)]
Revert "libclcore.bc comes from prebuilts/sdk for unbundled projects."
This reverts commit
ba6a7e1d46ef48d1dc58f3313e56613067ed07fb
Change-Id: I2855923e67c226d39fe362342570e9ab96b885b8
The Android Automerger [Wed, 23 Jan 2013 15:11:53 +0000 (07:11 -0800)]
JWQ23
The Android Automerger [Wed, 23 Jan 2013 15:10:08 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Stephen Hines [Thu, 17 Jan 2013 00:02:08 +0000 (16:02 -0800)]
libclcore.bc comes from prebuilts/sdk for unbundled projects.
This change also adds the NDK library path for unbundled builds.
Bug:
7419958
Change-Id: If22823c3890f5507d486e654a1e0296c06a2e239
The Android Automerger [Tue, 22 Jan 2013 23:19:37 +0000 (15:19 -0800)]
JWQ22B
The Android Automerger [Tue, 22 Jan 2013 15:10:55 +0000 (07:10 -0800)]
JWQ22
The Android Automerger [Tue, 22 Jan 2013 15:10:03 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Stephen Hines [Thu, 10 Jan 2013 09:51:01 +0000 (01:51 -0800)]
Update build for LLVM merge to r171906.
Change-Id: Ib1e701e548bd3e11cdee712fcbb8266447dfb21a
The Android Automerger [Mon, 21 Jan 2013 15:11:42 +0000 (07:11 -0800)]
JWQ21
The Android Automerger [Mon, 21 Jan 2013 15:10:10 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Stephen Hines [Sat, 19 Jan 2013 01:22:21 +0000 (01:22 +0000)]
Merge "Build RS compatibility objects with libcompiler-rt.a."
Stephen Hines [Sat, 19 Jan 2013 00:27:23 +0000 (16:27 -0800)]
Build RS compatibility objects with libcompiler-rt.a.
Change-Id: Ic49fdc30b1d4568bbdc94338e116a31a1ade1e80
The Android Automerger [Fri, 18 Jan 2013 15:11:37 +0000 (07:11 -0800)]
JWQ18
The Android Automerger [Fri, 18 Jan 2013 15:10:10 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Ying Wang [Fri, 18 Jan 2013 02:15:01 +0000 (18:15 -0800)]
am
58aee9e3: (-s ours) am
383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
* commit '
58aee9e30e3a8dd4471344d9ae5c514c38b42548':
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Ying Wang [Fri, 18 Jan 2013 02:13:08 +0000 (18:13 -0800)]
am
383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
* commit '
383ecfaf023dab1fcab25d97548093e32ef1a564':
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Ying Wang [Tue, 4 Dec 2012 02:24:55 +0000 (18:24 -0800)]
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Cherry picked from commit
fe3f62d06b77888cddf0365a40b20835eeac221f
in master. Since this is already in master, and we're upstream,
set to DO NOT MERGE.
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: Mike J. Chen <mjchen@google.com>
The Android Automerger [Thu, 17 Jan 2013 22:00:30 +0000 (14:00 -0800)]
JWQ17B
Chiao Cheng [Thu, 17 Jan 2013 20:50:31 +0000 (12:50 -0800)]
Move Dialer app from core to telephony product target.
Bug:
8014407
Change-Id: I76ca58c4cbf05ebbd64131c17075ad4b8a919326
The Android Automerger [Thu, 17 Jan 2013 15:11:26 +0000 (07:11 -0800)]
JWQ17
The Android Automerger [Thu, 17 Jan 2013 15:10:12 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Simon Wilson [Wed, 16 Jan 2013 00:03:59 +0000 (16:03 -0800)]
Add audio-route to pathmap.mk
Change-Id: Id72a839c188fdc93a6a10f53033f09aded23782e
The Android Automerger [Wed, 16 Jan 2013 21:53:23 +0000 (13:53 -0800)]
JWQ16B
The Android Automerger [Wed, 16 Jan 2013 18:53:39 +0000 (10:53 -0800)]
JWQ16
The Android Automerger [Wed, 16 Jan 2013 18:09:07 +0000 (10:09 -0800)]
merge in jb-mr2-release history after reset to master
Ben Cheng [Tue, 15 Jan 2013 22:36:42 +0000 (14:36 -0800)]
Stash TARGET_CPU_VARIANT and print it in dumpvar.
Bug:
7961327
Change-Id: I8a3637a87b5a0f791568fe74e44a4a173541deb7
Ying Wang [Tue, 15 Jan 2013 23:28:08 +0000 (15:28 -0800)]
Support to switch between prebuilt and buiding from source
For target shared library and executable.
Change-Id: I40a4e4e0c971811ac60e9bd04206f2422387d3d0
Scott Main [Tue, 15 Jan 2013 05:16:42 +0000 (21:16 -0800)]
am
85ab41eb: am
fb959d01: am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
85ab41eb6b7229dd1fcb08187f27a32ee754c05d':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:13:27 +0000 (21:13 -0800)]
am
fb959d01: am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:10:48 +0000 (21:10 -0800)]
am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
474b3f1198223b61f912c29d2e5c069dcfe322e0':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:07:29 +0000 (21:07 -0800)]
am
eb41035f: docs: add the ability to pause the carousel
* commit '
eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 03:03:40 +0000 (19:03 -0800)]
docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
Ben Cheng [Mon, 14 Jan 2013 23:07:59 +0000 (15:07 -0800)]
Merge "Use -mcpu=cortex-a15 for gcc arch dependent compilation."
Ben Cheng [Mon, 14 Jan 2013 21:45:45 +0000 (13:45 -0800)]
Use -mcpu=cortex-a15 for gcc arch dependent compilation.
If TARGET_CPU_VARIANT=cortex-a15 is specified in the BoardConfig.mk file.
Bug:
7961327
Change-Id: Ic459df378293237c54263f5315ac3be62dad4273
The Android Automerger [Mon, 14 Jan 2013 15:51:17 +0000 (07:51 -0800)]
AAQ14
The Android Automerger [Mon, 14 Jan 2013 15:49:06 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Ying Wang [Fri, 11 Jan 2013 23:31:06 +0000 (15:31 -0800)]
Add new LOCAL_PROGUARD_ENABLED option "nosystem"
With which we don't include proguard flags defined by the build system.
Bug:
7990659
Change-Id: I78384d2fbaccdd714d646e1b648417195bbd8dde
The Android Automerger [Fri, 11 Jan 2013 15:51:33 +0000 (07:51 -0800)]
AAQ11
The Android Automerger [Fri, 11 Jan 2013 15:49:08 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Fri, 11 Jan 2013 00:10:34 +0000 (16:10 -0800)]
AAQ10B
Scott Main [Thu, 10 Jan 2013 23:38:23 +0000 (15:38 -0800)]
am
18ae42f3: am
468a239d: am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
18ae42f3c84744eca9fd96afcbcf365427e1578f':
docs: update analytics script to support event tracking
Ying Wang [Thu, 10 Jan 2013 22:28:56 +0000 (14:28 -0800)]
resolved conflicts for merge of
e016e80c to jb-mr1-dev-plus-aosp
Change-Id: Ic1546db5d009307789e0c7fda811982f80655dea
The Android Automerger [Thu, 10 Jan 2013 15:50:57 +0000 (07:50 -0800)]
AAQ10
The Android Automerger [Thu, 10 Jan 2013 15:49:05 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Thu, 10 Jan 2013 00:48:48 +0000 (16:48 -0800)]
AAQ09B
The Android Automerger [Wed, 9 Jan 2013 15:51:08 +0000 (07:51 -0800)]
AAQ09
The Android Automerger [Wed, 9 Jan 2013 15:49:05 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Scott Main [Wed, 9 Jan 2013 02:59:29 +0000 (18:59 -0800)]
am
468a239d: am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
468a239d0cc522623f1896b3837092f629393292':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:56:40 +0000 (18:56 -0800)]
am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:49:51 +0000 (18:49 -0800)]
am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
869f3d1f68194b5962070394882b85f46a415c4c':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:47:45 +0000 (18:47 -0800)]
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
Scott Main [Wed, 9 Jan 2013 02:45:08 +0000 (18:45 -0800)]
docs: update analytics script to support event tracking
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
Jean-Baptiste Queru [Tue, 8 Jan 2013 16:17:19 +0000 (08:17 -0800)]
am
b81bc684: am
7a184cb7: Merge "Change Email2 reference back to Email"
* commit '
b81bc6842e6743e548a76a1c2f2ac59b4f080b10':
Change Email2 reference back to Email
Jean-Baptiste Queru [Tue, 8 Jan 2013 16:13:50 +0000 (08:13 -0800)]
am
7a184cb7: Merge "Change Email2 reference back to Email"
* commit '
7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
Change Email2 reference back to Email
Jean-Baptiste Queru [Tue, 8 Jan 2013 15:55:50 +0000 (07:55 -0800)]
Merge "Change Email2 reference back to Email"
The Android Automerger [Tue, 8 Jan 2013 15:50:56 +0000 (07:50 -0800)]
AAQ08
The Android Automerger [Tue, 8 Jan 2013 15:49:02 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Roger Chen [Tue, 8 Jan 2013 13:20:32 +0000 (21:20 +0800)]
Change Email2 reference back to Email
Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>