Dirk Dougherty
9f81546a25
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.
2012-10-11 17:14:19 -07:00
Ying Wang
fa67cfe98c
am ad12a050: am 11b15b15: Resovle symlink in findmakefiles in envsetup.sh
...
* commit 'ad12a050db35689da69a365d01b266c677b08a2c':
Resovle symlink in findmakefiles in envsetup.sh
2012-10-11 17:13:22 -07:00
Ying Wang
97b56bb181
am 95d861ed: am 72405497: Convert to relative path for CleanSpec.mk
...
* commit '95d861ed9beff9e55c3283c1fa47c84ac61fa546':
Convert to relative path for CleanSpec.mk
2012-10-11 17:12:05 -07:00
Dirk Dougherty
fc8cec68fa
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.
2012-10-11 16:59:11 -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
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
Ying Wang
ad12a050db
am 11b15b15: Resovle symlink in findmakefiles in envsetup.sh
...
* commit '11b15b15ce69b2d0b88080888865ed9f590a18fd':
Resovle symlink in findmakefiles in envsetup.sh
2012-10-11 15:15:47 -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
95d861ed9b
am 72405497: Convert to relative path for CleanSpec.mk
...
* commit '7240549748fd4e4879009524a6d01a4c26294568':
Convert to relative path for CleanSpec.mk
2012-10-11 12:58:27 -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 Open Source Project
ed14f90b34
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I5bba3384a0cc6db0c4a2c358525dffa7f7704fcf
2012-10-11 08:04:21 -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 Open Source Project
e4c22cb38a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ic024d25bb6750ddb85556f5e12f407eaee40086e
2012-10-11 05:56:43 -07:00
The Android Automerger
bc1e541fcf
JOP10E
2012-10-10 19:21:32 -07:00
Christopher Tate
5a708879a8
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
2012-10-10 15:39:21 -07:00
Christopher Tate
0743f28b0f
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
2012-10-10 15:37:23 -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
2b6d1e24b8
am 1815fc87: am 57ddcb1b: Support to build executables against the NDK
...
* commit '1815fc877d27b5d3409ebfd38e14f5cd15e5be9b':
Support to build executables against the NDK
2012-10-10 13:52:58 -07:00
Ying Wang
1815fc877d
am 57ddcb1b: Support to build executables against the NDK
...
* commit '57ddcb1bbce7a980e677dfd212ce76229fe33f55':
Support to build executables against the NDK
2012-10-10 13:51:29 -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 Open Source Project
801b46e461
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I0daadc68f6e805b600705cf334eb1c093bd40f6e
2012-10-10 09:43:49 -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
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 Open Source Project
65809f42fa
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I9029b7e89fc2813f140408166e7a06f6784021c4
2012-10-09 07:28:06 -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
Scott Main
505fae2ae4
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
2012-10-08 16:10:43 -07:00
Scott Main
3dd2756e9b
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
2012-10-08 16:09: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