The Android Automerger
86135e25d0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 16:32:31 -07:00
The Android Automerger
7c9f90440d
JOP12B
2012-10-12 11:50:51 -07:00
The Android Automerger
c1b3082c8e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 11:49:45 -07:00
The Android Automerger
7027936923
JVP12
2012-10-12 10:28:44 -07:00
The Android Automerger
5d8786bc37
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 10:26:19 -07:00
The Android Automerger
c54eaf4fc2
JOP12
2012-10-12 07:00:22 -07:00
The Android Automerger
b2fe24f927
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 06:59:06 -07:00
Ying Wang
abc9d6f2be
Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
2012-10-11 18:01:17 -07:00
Ying Wang
c58b194e78
Delete the unused LOCAL_POST_PROCESS_COMMAND.
...
Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
2012-10-11 17:26:07 -07:00
Stephen Hines
0a0cfe95ac
Merge "Add support for building Filterscript files." into jb-mr1-dev
2012-10-11 17:25:21 -07:00
Dirk Dougherty
afc782da46
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.
2012-10-11 16:57:43 -07:00
The Android Automerger
b78e720015
JOP11B
2012-10-11 16:27:47 -07:00
The Android Automerger
59a1df50ca
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 16:26:14 -07:00
Dirk Dougherty
77b10b6a78
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.
2012-10-11 15:33:05 -07:00
Dirk Dougherty
e37b7a52ab
am 8f20607c: Doc change: add new items to qv and adjust height.
...
* commit '8f20607ccb9c41469eec8f1f481d8d841bbeb2a1':
Doc change: add new items to qv and adjust height.
2012-10-11 15:31:29 -07:00
Dirk Dougherty
8f20607ccb
Doc change: add new items to qv and adjust height.
...
Change-Id: I246c36e0aabb32264325e0943aed127419da2a73
2012-10-11 15:29:33 -07:00
Stephen Hines
0ab6e3e6e6
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
2012-10-11 15:29:10 -07:00
Ying Wang
11b15b15ce
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
2012-10-11 15:05:07 -07:00
Ying Wang
7240549748
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
2012-10-11 12:45:30 -07:00
The Android Automerger
d489d964f0
JVP11
2012-10-11 08:21:16 -07:00
The Android Automerger
1bb184c0ae
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-11 08:18:48 -07:00
The Android Automerger
b21b6376a4
JOP11
2012-10-11 07:05:02 -07:00
The Android Automerger
b10de3ea3a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-11 06:59:07 -07:00
The Android Automerger
bc1e541fcf
JOP10E
2012-10-10 19:21:32 -07:00
Christopher Tate
fd671b2d5f
Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev
2012-10-10 15:35:00 -07:00
Christopher Tate
a3f11e6e66
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
2012-10-10 14:13:59 -07:00
The Android Automerger
07da118d1c
JOP10D
2012-10-10 14:08:03 -07:00
The Android Automerger
31a3c86bac
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 14:06:21 -07:00
Ying Wang
57ddcb1bbc
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
2012-10-10 10:24:26 -07:00
The Android Automerger
fc7d0c70e6
JOP10C
2012-10-10 09:58:54 -07:00
The Android Automerger
bcdd6fc0d2
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 09:58:25 -07:00
The Android Automerger
8a0bada351
JOP10B
2012-10-10 09:52:55 -07:00
The Android Automerger
07d1f65113
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 09:51:58 -07:00
The Android Automerger
c525c5fc43
JVP10
2012-10-10 09:20:28 -07:00
The Android Automerger
0fe8abe248
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-10 08:42:55 -07:00
The Android Automerger
9f4f06ff13
JOP10
2012-10-10 07:00:50 -07:00
The Android Automerger
d0f1c3d794
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 06:59:08 -07:00
The Android Automerger
392b8647c7
JOP09D
2012-10-09 22:59:46 -07:00
Guang Zhu
9d37c68ead
DO NOT MERGE: better late than never: fix build id for JB MR1
...
Change-Id: Iaad3002693af683f719832d3c082e7e4dcbf8d29
2012-10-09 18:45:31 -07:00
The Android Automerger
a0b204b06b
JOP09C
2012-10-09 17:54:34 -07:00
The Android Automerger
672dc693c6
JOP09B
2012-10-09 16:10:49 -07:00
The Android Automerger
26375f7f37
JOP08
2012-10-09 16:07:43 -07:00
The Android Automerger
fd0b6532cd
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 16:07:18 -07:00
The Android Automerger
3dbf42be09
JOP08wq!
2012-10-09 16:01:50 -07:00
Ed Heyl
24329b1c8a
JVP09
...
Change-Id: I2cf8d637b20668cef80630f81ec5be21c0e637d9
2012-10-09 14:20:54 -07:00
The Android Automerger
0a160481e7
JOP09
2012-10-09 07:00:54 -07:00
The Android Automerger
949a5c467e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 06:59:06 -07:00
The Android Automerger
ada6ef0ec1
JOP08B
2012-10-08 16:08:35 -07:00
Scott Main
d73053a814
am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
...
* commit 'b282c359fcbde7f36b579cde388ca044a0dd6d60':
fix layout bug on API Guide landing pages
2012-10-08 16:06:43 -07:00
Scott Main
b282c359fc
am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
...
* commit '126c5e9205263f097af4d0f9dca3b10c9a02d72b':
fix layout bug on API Guide landing pages
2012-10-08 16:04:25 -07:00
