OSDN Git Service
The Android Automerger [Wed, 24 Oct 2012 04:52:40 +0000 (21:52 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 23 Oct 2012 23:48:15 +0000 (16:48 -0700)]
JOP23C
The Android Automerger [Tue, 23 Oct 2012 23:46:40 +0000 (16:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 23 Oct 2012 21:38:26 +0000 (14:38 -0700)]
JOP23B
The Android Automerger [Tue, 23 Oct 2012 21:36:58 +0000 (14:36 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 23 Oct 2012 14:00:38 +0000 (07:00 -0700)]
JOP23
The Android Automerger [Tue, 23 Oct 2012 13:59:11 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
The Android Automerger [Mon, 22 Oct 2012 23:43:27 +0000 (16:43 -0700)]
JOP22B
The Android Automerger [Mon, 22 Oct 2012 23:41:46 +0000 (16:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 22 Oct 2012 13:59:57 +0000 (06:59 -0700)]
JOP22
The Android Automerger [Mon, 22 Oct 2012 13:59:03 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 21 Oct 2012 13:59:39 +0000 (06:59 -0700)]
JOP21
The Android Automerger [Sun, 21 Oct 2012 13:59:03 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 21 Oct 2012 06:15:17 +0000 (23:15 -0700)]
JOP20
The Android Automerger [Sun, 21 Oct 2012 06:13:48 +0000 (23:13 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 19 Oct 2012 22:47:30 +0000 (15:47 -0700)]
JOP19B
The Android Automerger [Fri, 19 Oct 2012 22:45:59 +0000 (15:45 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 19 Oct 2012 14:01:31 +0000 (07:01 -0700)]
JOP19
The Android Automerger [Fri, 19 Oct 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 18 Oct 2012 14:00:59 +0000 (07:00 -0700)]
JOP18
The Android Automerger [Thu, 18 Oct 2012 13:59:15 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 23:08:34 +0000 (16:08 -0700)]
JOP17C
The Android Automerger [Wed, 17 Oct 2012 23:06:51 +0000 (16:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 17:56:30 +0000 (10:56 -0700)]
JOP17B
The Android Automerger [Wed, 17 Oct 2012 14:00:47 +0000 (07:00 -0700)]
JOP17
The Android Automerger [Wed, 17 Oct 2012 13:59:07 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 00:32:17 +0000 (17:32 -0700)]
JOP16B
The Android Automerger [Wed, 17 Oct 2012 00:30:07 +0000 (17:30 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 16 Oct 2012 14:01:45 +0000 (07:01 -0700)]
JOP16
The Android Automerger [Tue, 16 Oct 2012 13:59:07 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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: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: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
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
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
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 [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: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 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 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 Automerger [Thu, 11 Oct 2012 02:21:32 +0000 (19:21 -0700)]
JOP10E
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, 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 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!
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
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
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
OSDN Git Service
