OSDN Git Service
Andrew Hsieh [Wed, 24 Oct 2012 00:15:01 +0000 (17:15 -0700)]
am
7176e801: Merge "Add TARGET_GCC_VERSION"
* commit '
7176e8013bb2e563c3e3e56af4c04c50de3a7f37':
Add TARGET_GCC_VERSION
Andrew Hsieh [Tue, 23 Oct 2012 23:59:17 +0000 (16:59 -0700)]
Merge "Add TARGET_GCC_VERSION"
Andrew Hsieh [Tue, 23 Oct 2012 04:06:01 +0000 (12:06 +0800)]
Add TARGET_GCC_VERSION
Default to 4.6, but can overwritten to something else in
prebuilts/gcc/$os/$arch/$arch-linux-android*-$ver
Change-Id: I16f99d642b8ff8e831d392261a0c536041107051
Scott Main [Tue, 23 Oct 2012 03:42:17 +0000 (20:42 -0700)]
am
f98bd743: am
bd027cd4: am
ab84504b: am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
f98bd74319bcb22e5efd8b73b2cabe2268923208':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:40:31 +0000 (20:40 -0700)]
am
bd027cd4: am
ab84504b: am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
bd027cd4e79b281dc414e170ada4f92bd580dbf0':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:37:56 +0000 (20:37 -0700)]
am
ab84504b: am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
ab84504b8a9e24b15af916faa95dcf65685a22a3':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:35:42 +0000 (20:35 -0700)]
am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
6613a2327512f3742d55cf0eb79fc4d52cf9a7cb':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:33:41 +0000 (20:33 -0700)]
am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
0e585706f0199f9d277e0d099ece682a2ee502ef':
fix spacing in carousel text for Develop homepage
Scott Main [Tue, 23 Oct 2012 03:30:22 +0000 (20:30 -0700)]
fix spacing in carousel text for Develop homepage
Change-Id: If8f95e66b4c1b4918b0d1dea59241d5a17acbfd9
Nick Kralevich [Mon, 22 Oct 2012 18:04:24 +0000 (11:04 -0700)]
am
d883749e: Merge "x86: add --warn-shared-textrel"
* commit '
d883749e600a34b5eb4db542d24946b25aa5c9fb':
x86: add --warn-shared-textrel
Nick Kralevich [Mon, 22 Oct 2012 17:11:15 +0000 (10:11 -0700)]
Merge "x86: add --warn-shared-textrel"
Joe Onorato [Sun, 21 Oct 2012 02:00:08 +0000 (19:00 -0700)]
am
2e5d317c: make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
* commit '
2e5d317c3ba36a7184b95cc77c87e116210ddc07':
make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
Joe Onorato [Sun, 21 Oct 2012 01:15:18 +0000 (18:15 -0700)]
am
8858d2a7: Add a tool to let you enforce layering between packages in a java module.
* commit '
8858d2a731f432786b7548b5f63ac93be81eb986':
Add a tool to let you enforce layering between packages in a java module.
Joe Onorato [Fri, 19 Oct 2012 19:04:55 +0000 (12:04 -0700)]
make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
Change-Id: I2595040f77f8ebb4d7c89140394a6060f167aee5
Joe Onorato [Mon, 31 Oct 2011 04:37:35 +0000 (21:37 -0700)]
Add a tool to let you enforce layering between packages in a java module.
And build system support for it too.
Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
Nick Kralevich [Fri, 19 Oct 2012 20:36:49 +0000 (13:36 -0700)]
x86: add --warn-shared-textrel
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.
This warning will turn into an error in a future change
(via --fatal-warnings)
Change-Id: I2d169c7ce3600d02e25591f3ec15aba363730298
References: http://www.akkadia.org/drepper/textrelocs.html
Elliott Hughes [Thu, 18 Oct 2012 21:44:23 +0000 (14:44 -0700)]
am
1a36c59e: Merge "Remove tzdata from core.mk, now we have explicit dependencies."
* commit '
1a36c59e41488dafe30aba1d2ccfd4ecd861c6ce':
Remove tzdata from core.mk, now we have explicit dependencies.
Elliott Hughes [Thu, 18 Oct 2012 21:06:03 +0000 (14:06 -0700)]
Merge "Remove tzdata from core.mk, now we have explicit dependencies."
Elliott Hughes [Thu, 18 Oct 2012 18:30:32 +0000 (11:30 -0700)]
Remove tzdata from core.mk, now we have explicit dependencies.
Bug:
7012465
Change-Id: I4c8aefdea49d9a21264580828146a4ae01dd1c95
Elliott Hughes [Thu, 18 Oct 2012 17:26:34 +0000 (10:26 -0700)]
am
83e024c0: Merge "Add new tzdata and tzdata-host to default product build"
* commit '
83e024c0ba569a14ee8c19fda0b90b8ac401d81a':
Add new tzdata and tzdata-host to default product build
Elliott Hughes [Thu, 18 Oct 2012 17:01:20 +0000 (10:01 -0700)]
Merge "Add new tzdata and tzdata-host to default product build"
Brian Carlstrom [Thu, 18 Oct 2012 02:13:53 +0000 (19:13 -0700)]
Add new tzdata and tzdata-host to default product build
Bug:
7012465
Change-Id: I551e88f88c6f0713f2c26d34c6aa08af32b35620
Kenny Root [Wed, 17 Oct 2012 00:34:42 +0000 (17:34 -0700)]
am
2e0d1af7: Merge changes I58d43128,Ie34c958f
* commit '
2e0d1af767f64996f47de2a84b685ddcfa02e686':
Remove HAVE_SELINUX guards, part 2
Remove HAVE_SELINUX guard
Kenny Root [Tue, 16 Oct 2012 23:33:42 +0000 (16:33 -0700)]
Merge changes I58d43128,Ie34c958f
* changes:
Remove HAVE_SELINUX guards, part 2
Remove HAVE_SELINUX guard
Kenny Root [Tue, 16 Oct 2012 20:43:08 +0000 (13:43 -0700)]
Remove HAVE_SELINUX guards, part 2
Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
The Android Open Source Project [Mon, 15 Oct 2012 14:37:49 +0000 (07:37 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I03093891a09e5cee2fee0838930b0578d31bb5fa
The Android Automerger [Mon, 15 Oct 2012 14:00:37 +0000 (07:00 -0700)]
JOP15
The Android Automerger [Mon, 15 Oct 2012 13:59:06 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 14 Oct 2012 13:59:49 +0000 (06:59 -0700)]
JOP14
The Android Automerger [Sun, 14 Oct 2012 13:59:03 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 13 Oct 2012 22:37:39 +0000 (15:37 -0700)]
JOP13
The Android Automerger [Sat, 13 Oct 2012 22:36:55 +0000 (15:36 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 13 Oct 2012 10:50:53 +0000 (03:50 -0700)]
JOP12D
The Android Automerger [Sat, 13 Oct 2012 10:49:55 +0000 (03:49 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Guang Zhu [Sat, 13 Oct 2012 00:08:39 +0000 (17:08 -0700)]
am
0f23979f: am
18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '
0f23979f29db6b46978b78da4db90df862ffb925':
DO NOT MERGE: better late than never: fix build id for JB MR1
Guang Zhu [Sat, 13 Oct 2012 00:06:21 +0000 (17:06 -0700)]
am
18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '
18daa1750ba31b510d07d0f65e8e8007ed90b902':
DO NOT MERGE: better late than never: fix build id for JB MR1
Guang Zhu [Sat, 13 Oct 2012 00:04:57 +0000 (17:04 -0700)]
Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:35:29 +0000 (16:35 -0700)]
JVP12C
The Android Automerger [Fri, 12 Oct 2012 23:34:26 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:33:40 +0000 (16:33 -0700)]
JOP12C
The Android Automerger [Fri, 12 Oct 2012 23:32:31 +0000 (16:32 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 18:50:51 +0000 (11:50 -0700)]
JOP12B
The Android Automerger [Fri, 12 Oct 2012 18:49:45 +0000 (11:49 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Fri, 12 Oct 2012 18:03:07 +0000 (11:03 -0700)]
am
6a44471c: am
abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
* commit '
6a44471c3b295190125a8ba33a02ec8db3a6aba9':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
Joe Onorato [Fri, 12 Oct 2012 18:02:53 +0000 (11:02 -0700)]
am
f9f6084a: Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
* commit '
f9f6084aab34daf4ea7ddb697d84a8b147523763':
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
The Android Automerger [Fri, 12 Oct 2012 17:28:44 +0000 (10:28 -0700)]
JVP12
The Android Automerger [Fri, 12 Oct 2012 17:26:19 +0000 (10:26 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 14:00:22 +0000 (07:00 -0700)]
JOP12
The Android Automerger [Fri, 12 Oct 2012 13:59:06 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Stephen Hines [Fri, 12 Oct 2012 05:08:57 +0000 (22:08 -0700)]
resolved conflicts for merge of
ed38fe6f to jb-mr1-dev-plus-aosp
Change-Id: If699b3ccf1f3befd4df881e3eef6b90dd7c505bf
Ying Wang [Fri, 12 Oct 2012 01:03:22 +0000 (18:03 -0700)]
am
abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
* commit '
abc9d6f2beca88dbd0ec021d343c68f4b617216d':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
Ying Wang [Fri, 12 Oct 2012 01:01:17 +0000 (18:01 -0700)]
Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
Joe Onorato [Wed, 10 Oct 2012 02:39:43 +0000 (19:39 -0700)]
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
(makes generating code easier)
Change-Id: I1e2e882f7805dbfe4b726955eddc5ff8bc3e0005
Stephen Hines [Fri, 12 Oct 2012 00:27:30 +0000 (17:27 -0700)]
am
0a0cfe95: Merge "Add support for building Filterscript files." into jb-mr1-dev
* commit '
0a0cfe95ac50457fe5539f913b372880ef841880':
Add support for building Filterscript files.
Ying Wang [Fri, 12 Oct 2012 00:26:07 +0000 (17:26 -0700)]
Delete the unused LOCAL_POST_PROCESS_COMMAND.
Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
Stephen Hines [Fri, 12 Oct 2012 00:25:20 +0000 (17:25 -0700)]
Merge "Add support for building Filterscript files." into jb-mr1-dev
Dirk Dougherty [Fri, 12 Oct 2012 00:14:19 +0000 (17:14 -0700)]
am
fc8cec68: am
afc782da: am
77b10b6a: am
e37b7a52: am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
fc8cec68facce8190d3a170d2accf9b16ce05aaa':
Doc change: add new items to qv and adjust height.
Ying Wang [Fri, 12 Oct 2012 00:13:22 +0000 (17:13 -0700)]
am
ad12a050: am
11b15b15: Resovle symlink in findmakefiles in envsetup.sh
* commit '
ad12a050db35689da69a365d01b266c677b08a2c':
Resovle symlink in findmakefiles in envsetup.sh
Ying Wang [Fri, 12 Oct 2012 00:12:05 +0000 (17:12 -0700)]
am
95d861ed: am
72405497: Convert to relative path for CleanSpec.mk
* commit '
95d861ed9beff9e55c3283c1fa47c84ac61fa546':
Convert to relative path for CleanSpec.mk
Dirk Dougherty [Thu, 11 Oct 2012 23:59:11 +0000 (16:59 -0700)]
am
afc782da: am
77b10b6a: am
e37b7a52: am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
afc782da46760e7f70df8fefc395b13e29933c5b':
Doc change: add new items to qv and adjust height.
Dirk Dougherty [Thu, 11 Oct 2012 23:57:43 +0000 (16:57 -0700)]
am
77b10b6a: am
e37b7a52: am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
77b10b6a78f8ef77e2d5bbb3cb650f953c642527':
Doc change: add new items to qv and adjust height.
The Android Automerger [Thu, 11 Oct 2012 23:27:47 +0000 (16:27 -0700)]
JOP11B
The Android Automerger [Thu, 11 Oct 2012 23:26:14 +0000 (16:26 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dirk Dougherty [Thu, 11 Oct 2012 22:33:05 +0000 (15:33 -0700)]
am
e37b7a52: am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
e37b7a52abb488f853fefa1a13eec1b5c20844a6':
Doc change: add new items to qv and adjust height.
Dirk Dougherty [Thu, 11 Oct 2012 22:31:29 +0000 (15:31 -0700)]
am
8f20607c: Doc change: add new items to qv and adjust height.
* commit '
8f20607ccb9c41469eec8f1f481d8d841bbeb2a1':
Doc change: add new items to qv and adjust height.
Dirk Dougherty [Mon, 8 Oct 2012 20:14:17 +0000 (13:14 -0700)]
Doc change: add new items to qv and adjust height.
Change-Id: I246c36e0aabb32264325e0943aed127419da2a73
Stephen Hines [Thu, 11 Oct 2012 22:01:53 +0000 (15:01 -0700)]
Add support for building Filterscript files.
This change piggybacks Filterscript rules onto the existing Renderscript
rules. There is no real difference other than the file extension (which
llvm-rs-cc uses to apply a more stringent set of warnings/errors).
Bug:
7166741
Change-Id: I27175ff1c16c27129cafa92b4e8caabf2e5f4150
Ying Wang [Thu, 11 Oct 2012 22:15:47 +0000 (15:15 -0700)]
am
11b15b15: Resovle symlink in findmakefiles in envsetup.sh
* commit '
11b15b15ce69b2d0b88080888865ed9f590a18fd':
Resovle symlink in findmakefiles in envsetup.sh
Ying Wang [Thu, 11 Oct 2012 22:05:07 +0000 (15:05 -0700)]
Resovle symlink in findmakefiles in envsetup.sh
So the returned path can match the one returned by gettop,
and so we can get the correct relative path of ONE_SHOT_MAKEFILE when running mm.
Change-Id: I492d68fec47e59ec9f4ea0fb5139b1a28af0f6cd
Ying Wang [Thu, 11 Oct 2012 19:58:27 +0000 (12:58 -0700)]
am
72405497: Convert to relative path for CleanSpec.mk
* commit '
7240549748fd4e4879009524a6d01a4c26294568':
Convert to relative path for CleanSpec.mk
Ying Wang [Thu, 11 Oct 2012 18:53:04 +0000 (11:53 -0700)]
Convert to relative path for CleanSpec.mk
When using mm, which passes in absolute path, while in full build relative
paths are used to encode clean steps.
Change-Id: I3e39ce3125194589f9a464f27eef4a9c96fa06c1
The Android Automerger [Thu, 11 Oct 2012 15:21:16 +0000 (08:21 -0700)]
JVP11
The Android Automerger [Thu, 11 Oct 2012 15:18:48 +0000 (08:18 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 15:04:21 +0000 (08:04 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5bba3384a0cc6db0c4a2c358525dffa7f7704fcf
The Android Automerger [Thu, 11 Oct 2012 14:05:02 +0000 (07:05 -0700)]
JOP11
The Android Automerger [Thu, 11 Oct 2012 13:59:07 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 12:56:43 +0000 (05:56 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic024d25bb6750ddb85556f5e12f407eaee40086e
The Android Automerger [Thu, 11 Oct 2012 02:21:32 +0000 (19:21 -0700)]
JOP10E
Christopher Tate [Wed, 10 Oct 2012 22:39:21 +0000 (15:39 -0700)]
am
0743f28b: am
fd671b2d: Merge "Add the new \'settings\' shell tool to the build" into jb-mr1-dev
* commit '
0743f28b0f2813ce9c93812cb212319d70734064':
Add the new 'settings' shell tool to the build
Christopher Tate [Wed, 10 Oct 2012 22:37:23 +0000 (15:37 -0700)]
am
fd671b2d: Merge "Add the new \'settings\' shell tool to the build" into jb-mr1-dev
* commit '
fd671b2d5feb158fbcf6598ec1ae8d0654c70c35':
Add the new 'settings' shell tool to the build
Christopher Tate [Wed, 10 Oct 2012 22:35:00 +0000 (15:35 -0700)]
Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev
Christopher Tate [Wed, 10 Oct 2012 21:13:59 +0000 (14:13 -0700)]
Add the new 'settings' shell tool to the build
The tool isn't useful unless it's actually built into products.
Bug
7299066
Change-Id: I9aaf37bde73a986d871eac6fd4dea15c192110cb
The Android Automerger [Wed, 10 Oct 2012 21:08:03 +0000 (14:08 -0700)]
JOP10D
The Android Automerger [Wed, 10 Oct 2012 21:06:21 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Wed, 10 Oct 2012 20:52:58 +0000 (13:52 -0700)]
am
1815fc87: am
57ddcb1b: Support to build executables against the NDK
* commit '
1815fc877d27b5d3409ebfd38e14f5cd15e5be9b':
Support to build executables against the NDK
Ying Wang [Wed, 10 Oct 2012 20:51:29 +0000 (13:51 -0700)]
am
57ddcb1b: Support to build executables against the NDK
* commit '
57ddcb1bbce7a980e677dfd212ce76229fe33f55':
Support to build executables against the NDK
Kenny Root [Wed, 10 Oct 2012 18:01:02 +0000 (11:01 -0700)]
Remove HAVE_SELINUX guard
Change-Id: Ie34c958fb20757f733b6c933bfe52691f773a342
Ying Wang [Wed, 26 Sep 2012 00:52:10 +0000 (17:52 -0700)]
Support to build executables against the NDK
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.
Bug:
7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b
The Android Automerger [Wed, 10 Oct 2012 16:58:54 +0000 (09:58 -0700)]
JOP10C
The Android Automerger [Wed, 10 Oct 2012 16:58:25 +0000 (09:58 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 16:52:55 +0000 (09:52 -0700)]
JOP10B
The Android Automerger [Wed, 10 Oct 2012 16:51:58 +0000 (09:51 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Wed, 10 Oct 2012 16:43:49 +0000 (09:43 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I0daadc68f6e805b600705cf334eb1c093bd40f6e
The Android Automerger [Wed, 10 Oct 2012 16:20:28 +0000 (09:20 -0700)]
JVP10
The Android Automerger [Wed, 10 Oct 2012 15:42:55 +0000 (08:42 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 14:00:50 +0000 (07:00 -0700)]
JOP10
The Android Automerger [Wed, 10 Oct 2012 13:59:08 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 05:59:46 +0000 (22:59 -0700)]
JOP09D
Guang Zhu [Wed, 10 Oct 2012 01:39:40 +0000 (18:39 -0700)]
DO NOT MERGE: better late than never: fix build id for JB MR1
Change-Id: Iaad3002693af683f719832d3c082e7e4dcbf8d29
The Android Automerger [Wed, 10 Oct 2012 00:54:34 +0000 (17:54 -0700)]
JOP09C