OSDN Git Service
Nick Sanders [Sat, 3 Nov 2012 01:48:59 +0000 (18:48 -0700)]
am
9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev
* commit '
9af26dddb39e5d87c8a455eb462eb3039e45ad69':
Disable factory build under PDK
Nick Sanders [Sat, 3 Nov 2012 01:46:44 +0000 (18:46 -0700)]
Merge "Disable factory build under PDK" into jb-mr1-aah-dev
Nick Sanders [Fri, 2 Nov 2012 19:55:56 +0000 (12:55 -0700)]
Disable factory build under PDK
Phantasm PDK support doesn't work with the factory build.
It's not needed for eng support so we'll disable it.
Change-Id: I9b65cdbb20bbcff601600d6b0cac7cc98f6f614c
Signed-off-by: Nick Sanders <nsanders@google.com>
The Android Open Source Project [Fri, 2 Nov 2012 14:27:40 +0000 (07:27 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I0a15906b6b86c84c785eb57cde0b202a3b0a97cf
The Android Automerger [Fri, 2 Nov 2012 06:43:31 +0000 (23:43 -0700)]
JOP32B
The Android Automerger [Fri, 2 Nov 2012 02:06:39 +0000 (19:06 -0700)]
JOP32
The Android Automerger [Fri, 2 Nov 2012 02:04:59 +0000 (19:04 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Robert Ly [Fri, 2 Nov 2012 00:39:11 +0000 (17:39 -0700)]
am
78377bcd: am
5a6e2407: am
0900e42e: am
12e6b988: am
e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '
78377bcd1a08d99e446dc7f1e1b886c624dd3148':
add css animation videos
Robert Ly [Fri, 2 Nov 2012 00:36:06 +0000 (17:36 -0700)]
am
5a6e2407: am
0900e42e: am
12e6b988: am
e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '
5a6e24074851fba5fb40b4f453d1a18852053ffa':
add css animation videos
Robert Ly [Fri, 2 Nov 2012 00:33:03 +0000 (17:33 -0700)]
am
0900e42e: am
12e6b988: am
e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '
0900e42e488eec40dd40c6e82a9823ca338b11b5':
add css animation videos
Robert Ly [Fri, 2 Nov 2012 00:31:20 +0000 (17:31 -0700)]
am
12e6b988: am
e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '
12e6b988cbe32fda61957ed87bfb30337c2b8f9d':
add css animation videos
Robert Ly [Fri, 2 Nov 2012 00:28:28 +0000 (17:28 -0700)]
am
e896e344: Merge "add css animation videos" into jb-dev-docs
* commit '
e896e3447145859371d2b7172122faabe44d10e2':
add css animation videos
Robert Ly [Fri, 2 Nov 2012 00:26:34 +0000 (17:26 -0700)]
Merge "add css animation videos" into jb-dev-docs
Robert Ly [Fri, 2 Nov 2012 00:09:52 +0000 (17:09 -0700)]
add css animation videos
Change-Id: I2e51cfce1af378e03a9ac40be76ab55e61d19f24
The Android Open Source Project [Thu, 1 Nov 2012 14:51:40 +0000 (07:51 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idf71be6e72f974579d6b5fe382f7fe4afd56c7cc
The Android Automerger [Thu, 1 Nov 2012 01:35:54 +0000 (18:35 -0700)]
JOP31
The Android Automerger [Thu, 1 Nov 2012 01:33:46 +0000 (18:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Wed, 31 Oct 2012 16:15:24 +0000 (09:15 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I588ae4c43c605d0a5d9b6a61e90f868b2fd41ea7
The Android Automerger [Wed, 31 Oct 2012 04:53:41 +0000 (21:53 -0700)]
JOP30C
The Android Automerger [Wed, 31 Oct 2012 03:13:08 +0000 (20:13 -0700)]
JOP30B
The Android Automerger [Wed, 31 Oct 2012 03:11:57 +0000 (20:11 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 30 Oct 2012 15:53:55 +0000 (08:53 -0700)]
JOP30
The Android Automerger [Tue, 30 Oct 2012 15:52:22 +0000 (08:52 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Tue, 30 Oct 2012 00:14:55 +0000 (17:14 -0700)]
am
a281e6a9: Merge "Filter out the overridden packages before doing required module expansion."
* commit '
a281e6a9c3e9ee2b38e38014324bf58ae1dff9a2':
Filter out the overridden packages before doing required module expansion.
The Android Automerger [Mon, 29 Oct 2012 18:21:19 +0000 (11:21 -0700)]
JOP29
The Android Automerger [Mon, 29 Oct 2012 18:19:42 +0000 (11:19 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 27 Oct 2012 01:18:17 +0000 (18:18 -0700)]
JOP26B
The Android Automerger [Sat, 27 Oct 2012 01:17:25 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Joe Onorato [Sat, 27 Oct 2012 01:16:39 +0000 (18:16 -0700)]
am
9a6a326c: Fix broken dependencies with the layers.txt files.
* commit '
9a6a326ccd975af6aa27f5d4043dfd04d85f9c16':
Fix broken dependencies with the layers.txt files.
Joe Onorato [Fri, 26 Oct 2012 23:25:05 +0000 (16:25 -0700)]
Fix broken dependencies with the layers.txt files.
When a device java module was using the layers.txt files, and that device java module depenended on
a host java module, when building the host java module, the layer checker tried to run and would
fail, complaining about the host module.
The problem was that since the value wasn't set for the host module, it would be inherited from its
dependent module (a make "feature") and would cause the layer checker to run. So this change makes
it explicitly set PRIVATE_JAVA_LAYERS_FILE for host java modules too.
Change-Id: Ifbc085295d0995a2da5d6d63d8cb379ef2631cc4
The Android Automerger [Fri, 26 Oct 2012 23:24:09 +0000 (16:24 -0700)]
JOP26
The Android Automerger [Fri, 26 Oct 2012 23:22:28 +0000 (16:22 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Fri, 26 Oct 2012 21:17:41 +0000 (14:17 -0700)]
Merge "Filter out the overridden packages before doing required module expansion."
Ying Wang [Thu, 23 Aug 2012 22:08:34 +0000 (15:08 -0700)]
Filter out the overridden packages before doing required module expansion.
Bug:
6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
The Android Automerger [Fri, 26 Oct 2012 20:53:07 +0000 (13:53 -0700)]
JOP24G
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: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
The Android Automerger [Fri, 26 Oct 2012 06:50:30 +0000 (23:50 -0700)]
JOP24F
The Android Automerger [Fri, 26 Oct 2012 04:42:22 +0000 (21:42 -0700)]
JOP24E
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
The Android Automerger [Thu, 25 Oct 2012 21:54:17 +0000 (14:54 -0700)]
JOP24D
The Android Automerger [Thu, 25 Oct 2012 20:43:53 +0000 (13:43 -0700)]
JOP24C
The Android Automerger [Thu, 25 Oct 2012 20:42:03 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
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
The Android Automerger [Wed, 24 Oct 2012 23:58:29 +0000 (16:58 -0700)]
JOP24B
The Android Automerger [Wed, 24 Oct 2012 23:56:44 +0000 (16:56 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 24 Oct 2012 21:59:41 +0000 (14:59 -0700)]
JVP15S
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
The Android Automerger [Wed, 24 Oct 2012 13:59:57 +0000 (06:59 -0700)]
JOP24
The Android Automerger [Wed, 24 Oct 2012 13:59:03 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 24 Oct 2012 06:36:27 +0000 (23:36 -0700)]
JOP23E
The Android Automerger [Wed, 24 Oct 2012 06:35:43 +0000 (23:35 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 24 Oct 2012 04:53:29 +0000 (21:53 -0700)]
JOP23D
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 [Wed, 24 Oct 2012 03:48:54 +0000 (20:48 -0700)]
JVP15R
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"
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 22:55:09 +0000 (15:55 -0700)]
JVP15Q
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 19:24:22 +0000 (12:24 -0700)]
JVP15P
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
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: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
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
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
The Android Automerger [Mon, 22 Oct 2012 17:36:59 +0000 (10:36 -0700)]
JVP15O
Nick Kralevich [Mon, 22 Oct 2012 17:11:15 +0000 (10:11 -0700)]
Merge "x86: add --warn-shared-textrel"
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 20:33:51 +0000 (13:33 -0700)]
JVP15N
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
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
OSDN Git Service
