OSDN Git Service
Ying Wang [Fri, 26 Oct 2012 17:57:24 +0000 (10:57 -0700)]
am
41824825: am
0d211eb9: Merge "Split to multiple bash commands."
* commit '
4182482522c15e8268605a4e903951072df4756d':
Split to multiple bash commands.
Ying Wang [Fri, 26 Oct 2012 17:54:52 +0000 (10:54 -0700)]
am
0d211eb9: Merge "Split to multiple bash commands."
* commit '
0d211eb9f4a2bb508f7c0cc649faf99b4815bfc7':
Split to multiple bash commands.
Ying Wang [Fri, 26 Oct 2012 17:14:42 +0000 (10:14 -0700)]
Merge "Split to multiple bash commands."
Ying Wang [Fri, 26 Oct 2012 16:21:28 +0000 (09:21 -0700)]
Split to multiple bash commands.
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Link: http://code.google.com/p/android/issues/detail?id=38937
Change-Id: I72258125c4297dfd9f8f502a96dbfa5a08f3cc50
Mike Lockwood [Fri, 26 Oct 2012 15:47:40 +0000 (08:47 -0700)]
am
86e2fd92: am
daf5e22d: Add new embedded target for a super minimal android build
* commit '
86e2fd9215faaffed47ab0373b2955d9a1892113':
Add new embedded target for a super minimal android build
Mike Lockwood [Fri, 26 Oct 2012 15:45:36 +0000 (08:45 -0700)]
am
daf5e22d: Add new embedded target for a super minimal android build
* commit '
daf5e22dbac03e174e22c8209ed97c44c3a2a2c9':
Add new embedded target for a super minimal android build
Mike Lockwood [Thu, 18 Oct 2012 17:17:47 +0000 (10:17 -0700)]
Add new embedded target for a super minimal android build
Remove obsolete BUILD_TINY_ANDROID
Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
Torne (Richard Coles) [Thu, 25 Oct 2012 14:49:39 +0000 (15:49 +0100)]
Use GYP instead of NONE as the module class for gyp.
The Chromium makefile generator used to use module class NONE for the
meta-targets in the gyp files; this was changed to GYP in order to make
it more obvious where they come from in the build. Update the build
system's handling of NOTICE files to reflect this change.
Change-Id: Iff7d4487f3024ec83db0c2a896ec0caf8fb18b24
Scott Main [Thu, 25 Oct 2012 02:45:40 +0000 (19:45 -0700)]
am
7a287372: am
cee5107c: am
4e51d8e6: am
4810a244: am
71e20e2e: am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
7a28737222067c2bf12c261bc5502a0fd77c67c2':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:43:00 +0000 (19:43 -0700)]
am
cee5107c: am
4e51d8e6: am
4810a244: am
71e20e2e: am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
cee5107cf6a2ba53a729e7eedc7c9c91bd27aa1b':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:40:45 +0000 (19:40 -0700)]
am
4e51d8e6: am
4810a244: am
71e20e2e: am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
4e51d8e6d5084a1c9133137e65a36d8e9e0c8cc1':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:38:51 +0000 (19:38 -0700)]
am
4810a244: am
71e20e2e: am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
4810a2440c5b9a890f653602164c72c8d0e86750':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:35:37 +0000 (19:35 -0700)]
am
71e20e2e: am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
71e20e2e562957681fdd3965dfc308edcbafa31f':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:33:16 +0000 (19:33 -0700)]
am
ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '
ef4d10811ae7949357cffcd9aa1dda93c2a582ca':
update class header for deprecated info
Scott Main [Thu, 25 Oct 2012 02:31:24 +0000 (19:31 -0700)]
Merge "update class header for deprecated info" into jb-dev-docs
Scott Main [Thu, 25 Oct 2012 01:20:23 +0000 (18:20 -0700)]
update class header for deprecated info
Change-Id: I4c41f0bdbac43dc49c99af7bcb5521f7e3278304
Dirk Dougherty [Wed, 24 Oct 2012 20:47:17 +0000 (13:47 -0700)]
am
dab9a7a1: am
37fdea96: am
db9ad2da: am
80ebbc3c: am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
dab9a7a1029242a6d7a8250f9e9bd22ce95b84f5':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:45:04 +0000 (13:45 -0700)]
am
37fdea96: am
db9ad2da: am
80ebbc3c: am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
37fdea969fa9e9685e9d3864055573464ff8cdbb':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:42:41 +0000 (13:42 -0700)]
am
db9ad2da: am
80ebbc3c: am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
db9ad2da9efbd5aa614f72a820edf6c1b1cfaf4b':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:39:55 +0000 (13:39 -0700)]
am
80ebbc3c: am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
80ebbc3c5fde6d653c92a0288e1967f519b9c9ef':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:38:19 +0000 (13:38 -0700)]
am
1a13c317: am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
1a13c317627996234a1dfa2c0736733bd1c4c696':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:35:53 +0000 (13:35 -0700)]
am
a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '
a4375a19c6ff958d33d62ee96f6ccdde223b0c7a':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Dirk Dougherty [Wed, 24 Oct 2012 20:33:39 +0000 (13:33 -0700)]
Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
Andrew Hsieh [Wed, 24 Oct 2012 00:29:45 +0000 (17:29 -0700)]
am
267b07b2: am
7176e801: Merge "Add TARGET_GCC_VERSION"
* commit '
267b07b2aafede64d212402c3554fc2888821c98':
Add TARGET_GCC_VERSION
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:43:36 +0000 (20:43 -0700)]
am
de42d4b0: am
f98bd743: am
bd027cd4: am
ab84504b: am
6613a232: am
0e585706: fix spacing in carousel text for Develop homepage
* commit '
de42d4b0bfc79760eb05eb29dd44d159903530ac':
fix spacing in carousel text for Develop homepage
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:06:18 +0000 (11:06 -0700)]
am
7c56556d: am
d883749e: Merge "x86: add --warn-shared-textrel"
* commit '
7c56556d183c7103bdd58884071fdb134eb82956':
x86: add --warn-shared-textrel
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:22:35 +0000 (19:22 -0700)]
am
0cf8969b: am
2e5d317c: make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
* commit '
0cf8969bebcc40ee0ba1d720a4cc3c0003ac1265':
make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
Joe Onorato [Sun, 21 Oct 2012 02:05:12 +0000 (19:05 -0700)]
resolved conflicts for merge of
50462d67 to master
Change-Id: I8652008641a3eb3bc98e0225d2a80997c11b1465
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
Nick Kralevich [Fri, 19 Oct 2012 17:06:04 +0000 (10:06 -0700)]
Merge "arm: turn on -Wl,--fatal-warnings"
Nick Kralevich [Thu, 18 Oct 2012 21:21:26 +0000 (14:21 -0700)]
arm: turn on -Wl,--fatal-warnings
Third time's the charm. :-)
In
b238210c0172e771b1302364273016ad1fabafb8, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation. At the time, we wrote:
=====
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)
=====
All code which uses text relocations has either been fixed, or
we've temporarily worked around the issue so the code can still
compile.
Enable --fatal-warnings.
This reverts commit
942167dab8345c420b205ce9b9b6b4fc779a7583.
Change-Id: I578701692ead7e7cd60d73d2070a5bed366e2c6c
Elliott Hughes [Thu, 18 Oct 2012 21:46:50 +0000 (14:46 -0700)]
am
0270c32b: am
1a36c59e: Merge "Remove tzdata from core.mk, now we have explicit dependencies."
* commit '
0270c32bbb4af609571c92839ce41983c50d68da':
Remove tzdata from core.mk, now we have explicit dependencies.
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."
Nick Kralevich [Thu, 18 Oct 2012 21:03:49 +0000 (14:03 -0700)]
Revert "arm: turn on -Wl,--fatal-warnings"
This reverts commit
3ab011bccd5ed416148bb6ab8ea06f23c89977e7.
Nick Kralevich [Thu, 18 Oct 2012 20:33:31 +0000 (13:33 -0700)]
Merge "arm: turn on -Wl,--fatal-warnings"
Nick Kralevich [Tue, 16 Oct 2012 22:17:30 +0000 (15:17 -0700)]
arm: turn on -Wl,--fatal-warnings
In
b238210c0172e771b1302364273016ad1fabafb8, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation. At the time, we wrote:
=====
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)
=====
All code which uses text relocations has either been fixed, or
we've temporarily worked around the issue so the code can still
compile.
Enable --fatal-warnings.
This reverts commit
4dc781657b7aa2385cc6ffedc8f3841abdcfd5f6.
Change-Id: I81b96477f1c11069637f28cfd8fb98d42b39be5e
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
Ying Wang [Thu, 18 Oct 2012 17:54:49 +0000 (10:54 -0700)]
Use PRIVATE_WARNINGS_ENABLE
Before this LOCA_WARNINGS_ENABLE never worked :-(
Change-Id: I129a0bbbbb68e4179454b0827b0b0d18d6de67a0
Ying Wang [Thu, 18 Oct 2012 17:35:48 +0000 (10:35 -0700)]
Merge "Add a tool to let you enforce layering between packages in a java module."
Elliott Hughes [Thu, 18 Oct 2012 17:28:49 +0000 (10:28 -0700)]
am
409688c3: am
83e024c0: Merge "Add new tzdata and tzdata-host to default product build"
* commit '
409688c34e876c4f1ae3ed4e6132916742487942':
Add new tzdata and tzdata-host to default product build
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
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
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:41:33 +0000 (17:41 -0700)]
resolved conflicts for merge of
37868329 to master
Change-Id: I437f42a7197d1716b4783749f2b27e19c8721395
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
Nick Kralevich [Tue, 16 Oct 2012 20:51:02 +0000 (13:51 -0700)]
Revert "arm: turn on -Wl,--fatal-warnings"
This reverts commit
edfee7250f072cb148da6de04eacb834366bef38.
Kenny Root [Tue, 16 Oct 2012 20:43:08 +0000 (13:43 -0700)]
Remove HAVE_SELINUX guards, part 2
Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
Nick Kralevich [Tue, 16 Oct 2012 20:38:37 +0000 (13:38 -0700)]
Merge "arm: turn on -Wl,--fatal-warnings"
Doug Zongker [Tue, 16 Oct 2012 18:02:13 +0000 (11:02 -0700)]
Merge "add multiple key support to signapk"
Doug Zongker [Tue, 16 Oct 2012 00:10:13 +0000 (17:10 -0700)]
add multiple key support to signapk
Support signing .apks (but not OTA packages) with multiple keys.
Bug:
7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
Ying Wang [Mon, 15 Oct 2012 21:36:22 +0000 (14:36 -0700)]
Add BOARD_DONT_BUILD_USERDATA_IMG
So board config can choose to not build userdata.img.
Change-Id: I1e6024abb7806492468801e49075fa24c05d2dd1
Nick Kralevich [Thu, 11 Oct 2012 22:01:24 +0000 (15:01 -0700)]
arm: turn on -Wl,--fatal-warnings
In
b238210c0172e771b1302364273016ad1fabafb8, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation. At the time, we wrote:
=====
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)
=====
We've successfully removed all text relocations from Android's
compiled code, so turn on -Wl,--fatal-warnings .
Some pre-compiled shared libraries continue to have text relocations,
but they will be unaffected by this change.
Change-Id: I505ea23120048afc45f62593704fe1d6d26a352c
The Android Open Source Project [Mon, 15 Oct 2012 14:40:17 +0000 (07:40 -0700)]
am
165c67aa: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
165c67aacd8c6e8e6ffe57e673602952e4b56219':
JOP15
JOP14
JOP13
JOP12D
JVP12C
JOP12C
JOP12B
JVP12
JOP12
JOP11B
JVP11
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
Dirk Dougherty [Sun, 14 Oct 2012 00:32:23 +0000 (17:32 -0700)]
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Change-Id: I5a14bae715187c3d9307b39394f1b53d4fed39dd
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:10:04 +0000 (17:10 -0700)]
am
ea718cdb: (-s ours) am
0f23979f: am
18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '
ea718cdb7834444512c376942020bba88a9e9ed0':
DO NOT MERGE: better late than never: fix build id for JB MR1
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:10:16 +0000 (11:10 -0700)]
am
57dfd515: am
6a44471c: am
abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
* commit '
57dfd515c33bbab26c820c812ebb4bc69c36a38f':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
Joe Onorato [Fri, 12 Oct 2012 18:10:15 +0000 (11:10 -0700)]
am
bd31f173: am
f9f6084a: Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
* commit '
bd31f1733370e7b260078b67c5e3a88ec7c50b11':
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
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 18:02:14 +0000 (11:02 -0700)]
am
d2637573: resolved conflicts for merge of
ed38fe6f to jb-mr1-dev-plus-aosp
* commit '
d26375733992298edc036652d25170e1cd7cbd49':
Add support for building Filterscript files.
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