OSDN Git Service
The Android Automerger [Tue, 20 Aug 2013 13:03:49 +0000 (06:03 -0700)]
"KRS51"
The Android Automerger [Tue, 20 Aug 2013 13:00:49 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 19 Aug 2013 22:12:57 +0000 (15:12 -0700)]
"KRS50B"
Dirk Dougherty [Mon, 19 Aug 2013 22:02:50 +0000 (15:02 -0700)]
am
337ebc19: am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
337ebc195ff7ebb4f12b9012ccfc9f89a8a66570':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 22:00:39 +0000 (15:00 -0700)]
am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
62c755a52a74dc2f887d51d48105eebff17a6346':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 21:57:19 +0000 (14:57 -0700)]
am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
f5ffd4a40c7a2165ff6ebe24a2aa189dea6b1806':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 19:26:07 +0000 (12:26 -0700)]
Clean up core css changes brought in with samples css.
Change-Id: I0920695be4f6ed7085508a4451c13bc7d9e65d9a
Dirk Dougherty [Mon, 19 Aug 2013 19:14:19 +0000 (12:14 -0700)]
am
6d244fb2: am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
6d244fb2ed0abdf843c33fca3a2ba2557ac921aa':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:12:07 +0000 (12:12 -0700)]
am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
d5ac833061b2233b71a60155656ca97cd5494746':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:09:46 +0000 (12:09 -0700)]
am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
4f7e5159409e71ecfeba86858f5ec044d043aff8':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Thu, 16 Sep 2010 17:43:40 +0000 (10:43 -0700)]
doc change: Samples browsing: basic support in templates and js/css.
Change-Id: Ie2323f5323c624420c90c8c782b840f183238f7c
The Android Automerger [Mon, 19 Aug 2013 13:05:28 +0000 (06:05 -0700)]
"KRS50"
The Android Automerger [Mon, 19 Aug 2013 13:01:06 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sat, 17 Aug 2013 00:16:38 +0000 (17:16 -0700)]
"KRS46F"
Ying Wang [Fri, 16 Aug 2013 20:24:47 +0000 (13:24 -0700)]
Add phony goal GET-INSTALL-PATH
It can be used as a goal of mm/mmm.
It prints out modules' install paths, which can be used by the runtest
utility.
Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
The Android Automerger [Fri, 16 Aug 2013 18:41:40 +0000 (11:41 -0700)]
"KRS46E"
The Android Automerger [Fri, 16 Aug 2013 00:16:23 +0000 (17:16 -0700)]
"KRS46D"
The Android Automerger [Thu, 15 Aug 2013 22:43:01 +0000 (15:43 -0700)]
"KRS46C"
Scott Main [Thu, 15 Aug 2013 21:51:37 +0000 (14:51 -0700)]
am
ce478d54: am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the referen
* commit '
ce478d54ad619c11b796b6286357c3203544d90d':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:45:35 +0000 (14:45 -0700)]
am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar w
* commit '
7e453280539406882215a0602ae6f63d7585fb9f':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:43:45 +0000 (14:43 -0700)]
am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appe
* commit '
52dd206715e9d8e80a22c7106ec783324d51e747':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Ying Wang [Thu, 15 Aug 2013 21:34:09 +0000 (14:34 -0700)]
am
fc8b6338: resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
* commit '
fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
No need to filter out AndroidConfig.h for unbundled build
Scott Main [Thu, 15 Aug 2013 19:22:28 +0000 (12:22 -0700)]
fix two bugs in site script.
1. Fix URL path check for reference docs to initalize api level and sidenav.
Previously, this condition was never true, so the sidenav would not be initialized
under default conditions and the reference drag bar would not appear.
2. Fix the recent change to the 'scroll into view' script so that it works
properly in a multi-pane sidenav (reference docs) by again making the offset
measurement relative to the parent container (but much better than was done before).
Change-Id: I2a31ed59d772346651c2432f0ed26530983c49ff
The Android Automerger [Thu, 15 Aug 2013 19:14:24 +0000 (12:14 -0700)]
"KRS46B"
Ying Wang [Thu, 15 Aug 2013 19:02:30 +0000 (12:02 -0700)]
resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
Ying Wang [Thu, 15 Aug 2013 18:55:46 +0000 (11:55 -0700)]
am
f4723fa4: No need to filter out AndroidConfig.h for unbundled build
* commit '
f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
No need to filter out AndroidConfig.h for unbundled build
Ying Wang [Thu, 15 Aug 2013 18:01:10 +0000 (11:01 -0700)]
No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
The Android Automerger [Thu, 15 Aug 2013 13:02:55 +0000 (06:02 -0700)]
"KRS46"
The Android Automerger [Thu, 15 Aug 2013 13:00:32 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 15 Aug 2013 00:47:59 +0000 (17:47 -0700)]
"KRS45D"
Vineeta Srivastava [Wed, 14 Aug 2013 20:28:06 +0000 (13:28 -0700)]
Fix missing camera from aosp builds.
Camera is no longer part of Gallery2 application. Added Camera2 for aosp builds.
Bug:
10324351
Change-Id: I6c468344af04106704876ac945ccaffd9be1674b
Vineeta Srivastava [Wed, 14 Aug 2013 20:28:06 +0000 (13:28 -0700)]
Fix missing camera from aosp builds.
Camera is no longer part of Gallery2 application. Added Camera2 for aosp builds.
Bug:
10324351
Change-Id: I6c468344af04106704876ac945ccaffd9be1674b
The Android Automerger [Wed, 14 Aug 2013 19:37:11 +0000 (12:37 -0700)]
"KRS45B"
The Android Open Source Project [Wed, 14 Aug 2013 19:16:12 +0000 (12:16 -0700)]
am
fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
fb2188d1390841285181256a0ec37c5558c971da':
"JWR66Y"
The Android Open Source Project [Wed, 14 Aug 2013 19:06:41 +0000 (12:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b
Ying Wang [Wed, 14 Aug 2013 16:28:18 +0000 (09:28 -0700)]
am
396fd67d: am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
396fd67d7a691a1226783f1b15442af86137eb3d':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:26:06 +0000 (09:26 -0700)]
am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
b9eee184f2ab291f5af6520c41f90a8857c4bd73':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:22:01 +0000 (09:22 -0700)]
am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
e391e7a86e806bd3d2549b6d12736166fafb746f':
Remove -allowaccessmodification from the basic Proguard flags
The Android Automerger [Wed, 14 Aug 2013 13:08:19 +0000 (06:08 -0700)]
"KRS45"
The Android Automerger [Wed, 14 Aug 2013 13:04:55 +0000 (06:04 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 14 Aug 2013 00:47:04 +0000 (17:47 -0700)]
"KRS44C"
Ying Wang [Wed, 14 Aug 2013 00:40:24 +0000 (17:40 -0700)]
Remove -allowaccessmodification from the basic Proguard flags
It seems with that flag Proguard modifies the class files in a way that
Dalvik does not like.
Bug:
10307364
Change-Id: If0cc7552da00ae8a3a3a39a9f2f029819ca3164a
The Android Automerger [Tue, 13 Aug 2013 22:20:55 +0000 (15:20 -0700)]
"JWR66Y"
Santos Cordon [Tue, 13 Aug 2013 22:11:25 +0000 (22:11 +0000)]
Merge "The big switch. Enabling InCallUi/Phone split by default." into klp-dev
Ying Wang [Tue, 13 Aug 2013 19:35:10 +0000 (12:35 -0700)]
Support for LOCAL_HAL_STATIC_LIBRARIES
Now you can have a board config variable BOARD_HAL_STATIC_LIBRARIES,
which is a list of board-specific HAL static library names with pattern
"lib<library_name>.<board_specific_suffix>". LOCAL_HAL_STATIC_LIBRARIES
is a list of "lib<library_name>" and any matched
BOARD_HAL_STATIC_LIBRARIES will be added to the LOCAL_STATIC_LIBRARIES;
if no match is found, lib<library_name>.default will be used.
Bug:
10262105
Change-Id: Ic89d8d417d1dd65a227e4187a157fd3b77c4af34
The Android Automerger [Tue, 13 Aug 2013 20:25:24 +0000 (13:25 -0700)]
"KRS44B"
The Android Open Source Project [Tue, 13 Aug 2013 17:11:58 +0000 (10:11 -0700)]
am
5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
5aac97cbfcb3f638805311ffe733e5bf6dc29747':
"JLS36B"
JWR66X
JSS15P
The Android Open Source Project [Tue, 13 Aug 2013 17:09:56 +0000 (10:09 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: I80fa0805a168773ba273726fb4827b6cc24bfb08
The Android Automerger [Tue, 13 Aug 2013 13:07:27 +0000 (06:07 -0700)]
"KRS44"
The Android Automerger [Tue, 13 Aug 2013 13:00:55 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Santos Cordon [Tue, 13 Aug 2013 04:42:24 +0000 (21:42 -0700)]
The big switch. Enabling InCallUi/Phone split by default.
.:::. .:::.
:::::::.:::::::
:::::::::::::::
':::::::::::::'
':::::::::'
':::::'
':'
with love, from California
Change-Id: Iba25accb46f81f0c36a9e3f1df0f990e27f51b9f
The Android Automerger [Mon, 12 Aug 2013 19:31:31 +0000 (12:31 -0700)]
"KRS43B"
The Android Automerger [Mon, 12 Aug 2013 13:06:00 +0000 (06:06 -0700)]
"KRS43"
The Android Automerger [Mon, 12 Aug 2013 13:00:44 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sat, 10 Aug 2013 19:08:48 +0000 (12:08 -0700)]
"KRS39E"
Ying Wang [Thu, 8 Aug 2013 23:34:29 +0000 (16:34 -0700)]
Don't bother going through the source tree
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.
Bug:
10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
The Android Automerger [Fri, 9 Aug 2013 16:57:42 +0000 (09:57 -0700)]
"KRS39D"
The Android Automerger [Fri, 9 Aug 2013 00:57:14 +0000 (17:57 -0700)]
KRS39C
The Android Automerger [Thu, 8 Aug 2013 23:53:41 +0000 (16:53 -0700)]
"JLS36B"
The Android Automerger [Thu, 8 Aug 2013 22:02:26 +0000 (15:02 -0700)]
"KRS39B"
The Android Open Source Project [Thu, 8 Aug 2013 21:14:13 +0000 (14:14 -0700)]
am
f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
f66a269fa4300fa691348bdd55a2a16ff55de608':
JWR66W
JSS15O
JLS36
JSS15N
"JSS15M"
"JSS15L"
"JSS15K"
The Android Automerger [Thu, 8 Aug 2013 14:55:42 +0000 (07:55 -0700)]
"KRS39"
The Android Automerger [Thu, 8 Aug 2013 14:53:12 +0000 (07:53 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 8 Aug 2013 14:47:58 +0000 (07:47 -0700)]
Fix klp-dev build file
The Android Automerger [Thu, 8 Aug 2013 14:39:23 +0000 (07:39 -0700)]
"KRS39B"
The Android Automerger [Thu, 8 Aug 2013 14:37:17 +0000 (07:37 -0700)]
merge in klp-dev history after reset to master
Jason Monk [Thu, 8 Aug 2013 02:41:28 +0000 (02:41 +0000)]
Merge "Add libpac, pacserver, and ProxyHandler to build."
Jason Monk [Tue, 16 Jul 2013 14:26:09 +0000 (10:26 -0400)]
Add libpac, pacserver, and ProxyHandler to build.
This allows frameworks to reference libpac, ProxyHandler and pacserver as
required to add PAC support.
bug:
10182711
Change-Id: Iffac836a517518bd4b9a473e09372fbd10315539
The Android Automerger [Wed, 7 Aug 2013 23:28:09 +0000 (16:28 -0700)]
"KRS38B"
The Android Automerger [Wed, 7 Aug 2013 23:10:36 +0000 (16:10 -0700)]
JWR66X
The Android Automerger [Wed, 7 Aug 2013 23:02:33 +0000 (16:02 -0700)]
JSS15P
The Android Open Source Project [Wed, 7 Aug 2013 16:42:55 +0000 (09:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: Ib795b6944220a2b13f6def23ee279815e53ac6b4
The Android Automerger [Wed, 7 Aug 2013 16:23:00 +0000 (09:23 -0700)]
Fix dev branch Build ID
The Android Automerger [Wed, 7 Aug 2013 16:16:08 +0000 (09:16 -0700)]
"KRS38B"
The Android Automerger [Wed, 7 Aug 2013 13:02:09 +0000 (06:02 -0700)]
"KRS38"
The Android Automerger [Wed, 7 Aug 2013 13:00:15 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
The Android Automerger [Wed, 7 Aug 2013 03:33:52 +0000 (20:33 -0700)]
JWR66W
The Android Automerger [Wed, 7 Aug 2013 03:09:28 +0000 (20:09 -0700)]
JSS15O
Mike Lockwood [Tue, 6 Aug 2013 23:07:13 +0000 (16:07 -0700)]
Fix typo from previous change to fix the build
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
The Android Automerger [Tue, 6 Aug 2013 22:23:40 +0000 (15:23 -0700)]
"KRS37B"
Mike Lockwood [Tue, 6 Aug 2013 22:07:18 +0000 (15:07 -0700)]
Add support for overriding default Java libraries on a per-target basis
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
The Android Automerger [Tue, 6 Aug 2013 15:19:01 +0000 (08:19 -0700)]
"KRS37"
The Android Automerger [Tue, 6 Aug 2013 15:16:59 +0000 (08:16 -0700)]
merge in klp-release history after reset to master
The Android Automerger [Tue, 6 Aug 2013 00:10:10 +0000 (17:10 -0700)]
KRS36B
Stuart Scott [Mon, 5 Aug 2013 22:21:00 +0000 (15:21 -0700)]
Add boot jars to fix Dalvik missing bootclasspath for mini emulator.
bug:
10146858
Change-Id: I159a5951a036f32c7eb02569c5b0fb12ce3a76dd
The Android Automerger [Mon, 5 Aug 2013 22:25:41 +0000 (15:25 -0700)]
JLS36
The Android Automerger [Mon, 5 Aug 2013 18:12:19 +0000 (11:12 -0700)]
JSS15N
The Android Automerger [Mon, 5 Aug 2013 13:04:30 +0000 (06:04 -0700)]
"KRS36"
The Android Automerger [Mon, 5 Aug 2013 13:00:48 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
Ying Wang [Sat, 3 Aug 2013 00:58:22 +0000 (17:58 -0700)]
am
4a0929e3: am
38775140: am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
4a0929e3590b08838280bffae56d357a6194260e':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:50:03 +0000 (17:50 -0700)]
resolved conflicts for merge of
79ee17ea to master
Change-Id: I78ae4a54bdc05df984061ac0b0d0fc3488b0534e
Ying Wang [Sat, 3 Aug 2013 00:40:59 +0000 (17:40 -0700)]
am
38775140: am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
387751401ca83e4419444247a176f2ea1f35a50b':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:40:58 +0000 (17:40 -0700)]
am
367e56f1: am
3fc8dacd: Remove abcc from build.
* commit '
367e56f1b7d79086785f61c8c522644f134c3136':
Remove abcc from build.
Ying Wang [Sat, 3 Aug 2013 00:39:01 +0000 (17:39 -0700)]
am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
08c07c590322e1cbc8464dd371a2e5120b88e38d':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:38:59 +0000 (17:38 -0700)]
am
3fc8dacd: Remove abcc from build.
* commit '
3fc8dacd9209a846de34edaee0dc14d50cae3d25':
Remove abcc from build.
Ying Wang [Fri, 2 Aug 2013 21:51:09 +0000 (21:51 +0000)]
Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
The Android Automerger [Fri, 2 Aug 2013 21:42:35 +0000 (14:42 -0700)]
"KRS31E"
Ying Wang [Fri, 2 Aug 2013 21:29:02 +0000 (14:29 -0700)]
Let apicheck visible to unbundled build.
Change-Id: I22cd1e67aeb6bf23229016215ee0a15f5116513f
(cherry picked from commit
48d132659ebf99cf41d9fbf62ab1f09604938ca7)
The Android Automerger [Fri, 2 Aug 2013 20:54:06 +0000 (13:54 -0700)]
"JSS15M"
Ying Wang [Fri, 2 Aug 2013 20:31:53 +0000 (20:31 +0000)]
Merge "Don't check build prebuilt modules."