OSDN Git Service
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
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.
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.
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 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
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
The Android Automerger [Tue, 9 Oct 2012 23:10:49 +0000 (16:10 -0700)]
JOP09B
The Android Automerger [Tue, 9 Oct 2012 23:07:43 +0000 (16:07 -0700)]
JOP08
The Android Automerger [Tue, 9 Oct 2012 23:07:18 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:01:50 +0000 (16:01 -0700)]
JOP08wq!
Ed Heyl [Tue, 9 Oct 2012 21:20:54 +0000 (14:20 -0700)]
JVP09
Change-Id: I2cf8d637b20668cef80630f81ec5be21c0e637d9
The Android Open Source Project [Tue, 9 Oct 2012 14:28:06 +0000 (07:28 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9029b7e89fc2813f140408166e7a06f6784021c4
The Android Automerger [Tue, 9 Oct 2012 14:00:54 +0000 (07:00 -0700)]
JOP09
The Android Automerger [Tue, 9 Oct 2012 13:59:06 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Scott Main [Mon, 8 Oct 2012 23:10:43 +0000 (16:10 -0700)]
am
3dd2756e: am
d73053a8: am
b282c359: am
126c5e92: am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
3dd2756e9bc63be9aa0ffe382457f8c86c44b423':
fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:09:06 +0000 (16:09 -0700)]
am
d73053a8: am
b282c359: am
126c5e92: am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
d73053a814260cb4a31a8a38727bbb6fc6f10946':
fix layout bug on API Guide landing pages
The Android Automerger [Mon, 8 Oct 2012 23:08:35 +0000 (16:08 -0700)]
JOP08B
Scott Main [Mon, 8 Oct 2012 23:06:43 +0000 (16:06 -0700)]
am
b282c359: am
126c5e92: am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
b282c359fcbde7f36b579cde388ca044a0dd6d60':
fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:04:25 +0000 (16:04 -0700)]
am
126c5e92: am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
126c5e9205263f097af4d0f9dca3b10c9a02d72b':
fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:02:05 +0000 (16:02 -0700)]
am
e6850d2d: fix layout bug on API Guide landing pages
* commit '
e6850d2db787a4e268b5cee57d74e9308180a589':
fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 22:59:01 +0000 (15:59 -0700)]
fix layout bug on API Guide landing pages
Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a
Ying Wang [Mon, 8 Oct 2012 21:21:37 +0000 (14:21 -0700)]
am
91fd1231: Support to build executables against the NDK
* commit '
91fd1231c3254bc9d0642e5a646b5657bdaedffa':
Support to build executables against the NDK
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).
Bug:
7170098
Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
The Android Automerger [Mon, 8 Oct 2012 14:00:04 +0000 (07:00 -0700)]
JOP08
The Android Automerger [Mon, 8 Oct 2012 13:59:05 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 8 Oct 2012 01:59:00 +0000 (18:59 -0700)]
JOP07D
The Android Automerger [Mon, 8 Oct 2012 01:57:48 +0000 (18:57 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 23:06:32 +0000 (16:06 -0700)]
JOP07C
The Android Automerger [Sun, 7 Oct 2012 23:05:02 +0000 (16:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 22:05:44 +0000 (15:05 -0700)]
JOP07B
The Android Automerger [Sun, 7 Oct 2012 14:00:38 +0000 (07:00 -0700)]
JOP07
The Android Automerger [Sun, 7 Oct 2012 13:59:05 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 6 Oct 2012 07:39:03 +0000 (00:39 -0700)]
JOP05E
The Android Automerger [Sat, 6 Oct 2012 00:28:51 +0000 (17:28 -0700)]
JOP05D
The Android Automerger [Fri, 5 Oct 2012 22:09:28 +0000 (15:09 -0700)]
JOP05C
Keun young Park [Fri, 5 Oct 2012 21:29:59 +0000 (14:29 -0700)]
am
0b82ffeb: am
f6e6bf7e: add mip32 stuffs to clang\'s unknown flag list
* commit '
0b82ffeb964bb4da7c7928d5b61c72579b6588b5':
add mip32 stuffs to clang's unknown flag list
Keun young Park [Fri, 5 Oct 2012 21:28:05 +0000 (14:28 -0700)]
am
f6e6bf7e: add mip32 stuffs to clang\'s unknown flag list
* commit '
f6e6bf7edf03b7f38f5452cc0749b705eb3a6ada':
add mip32 stuffs to clang's unknown flag list
Jean-Baptiste Queru [Fri, 5 Oct 2012 20:41:20 +0000 (13:41 -0700)]
am
4bf886ad: (-s ours) am
b8c037ba: Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
* commit '
4bf886adbee460bd0c550292a3aa580f8c8530a1':
Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building
Jean-Baptiste Queru [Fri, 5 Oct 2012 20:34:34 +0000 (13:34 -0700)]
am
b8c037ba: Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
* commit '
b8c037ba5f38fd734d89164c9583538104be1ecc':
Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building
Jean-Baptiste Queru [Fri, 5 Oct 2012 20:32:11 +0000 (13:32 -0700)]
Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
Keun young Park [Fri, 5 Oct 2012 20:26:19 +0000 (13:26 -0700)]
add mip32 stuffs to clang's unknown flag list
- mini_mips changed to mips32-fp to accomodate all mips variants
Bug:
7294949
Change-Id: Iae759e10e3f5d255e27b688042477263438bb7a7
The Android Automerger [Fri, 5 Oct 2012 19:32:34 +0000 (12:32 -0700)]
JOP05B
The Android Open Source Project [Fri, 5 Oct 2012 15:15:57 +0000 (08:15 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I694692df8c4b28b047f7da606799687320474c99
The Android Automerger [Fri, 5 Oct 2012 14:01:14 +0000 (07:01 -0700)]
JOP05
The Android Automerger [Fri, 5 Oct 2012 13:59:13 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Nick Kralevich [Fri, 5 Oct 2012 00:14:17 +0000 (17:14 -0700)]
am
f3b02739: am
7653519f: Merge "[MIPS] Makes a build system use PIE flag"
* commit '
f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8':
[MIPS] Makes a build system use PIE flag
Nick Kralevich [Fri, 5 Oct 2012 00:12:46 +0000 (17:12 -0700)]
am
7653519f: Merge "[MIPS] Makes a build system use PIE flag"
* commit '
7653519f4e9efaaef906d2e5d3b109909b6d45c7':
[MIPS] Makes a build system use PIE flag
The Android Automerger [Thu, 4 Oct 2012 23:58:19 +0000 (16:58 -0700)]
JOP04C
Nick Kralevich [Thu, 4 Oct 2012 23:07:46 +0000 (16:07 -0700)]
Merge "[MIPS] Makes a build system use PIE flag"
The Android Automerger [Thu, 4 Oct 2012 21:22:52 +0000 (14:22 -0700)]
JOP04B
Ying Wang [Thu, 4 Oct 2012 17:05:00 +0000 (10:05 -0700)]
am
25f77e39: am
af4299c5: Merge "Store vendor module owner info on the build server." into jb-mr1-dev
* commit '
25f77e39bc49c3598aa2bc8e27719927a522ccbd':
Store vendor module owner info on the build server.
Ying Wang [Thu, 4 Oct 2012 17:02:38 +0000 (10:02 -0700)]
am
af4299c5: Merge "Store vendor module owner info on the build server." into jb-mr1-dev
* commit '
af4299c56d57de8c274889305b62280bcdf9a672':
Store vendor module owner info on the build server.
Ying Wang [Thu, 4 Oct 2012 17:01:14 +0000 (10:01 -0700)]
Merge "Store vendor module owner info on the build server." into jb-mr1-dev
The Android Open Source Project [Thu, 4 Oct 2012 14:47:20 +0000 (07:47 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I24595095d111a62fb0525aa8102b04a847aa7538
The Android Automerger [Thu, 4 Oct 2012 14:01:31 +0000 (07:01 -0700)]
JOP04
OSDN Git Service
