OSDN Git Service
Brian Carlstrom [Wed, 10 Jul 2013 19:43:07 +0000 (12:43 -0700)]
Disable ART runtime for darwin
Change-Id: Icdad4f422bacc3f997f585df48cc6f1c2d7c7642
Brian Carlstrom [Wed, 10 Jul 2013 17:32:00 +0000 (10:32 -0700)]
Add ART runtime to userdebug and eng builds to allow dual booting via developer options
Change-Id: Id3f2ffe92ca083853bd28f155a314612e8b1b2f6
Brian Carlstrom [Sun, 30 Jun 2013 20:18:13 +0000 (13:18 -0700)]
Renaming dalvik.vm.lib to persist.sys.dalvik.vm.lib
Change-Id: I84ecdd1250ce7b4a367f9e07c1d198ef9a7cf066
Dirk Dougherty [Tue, 9 Jul 2013 00:42:22 +0000 (17:42 -0700)]
am
ae3be8a5: am
8c01be68: am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
ae3be8a5f4df872a149cbfc537e315cbb6bc592b':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:37:50 +0000 (17:37 -0700)]
am
8c01be68: am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
8c01be686cacb593677dd1a753c132e58aa87661':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:33:58 +0000 (17:33 -0700)]
am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
ccc15faf56ad46f973800cb6bd41b4634b9192a0':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:32:03 +0000 (17:32 -0700)]
am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
56811475202ededf0c76bf9b28d3e27d5761d747':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:29:54 +0000 (17:29 -0700)]
am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
5386532e03bbc76bcdf8a76877ef460bfe764925':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:28:40 +0000 (00:28 +0000)]
Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
Dirk Dougherty [Mon, 8 Jul 2013 23:05:05 +0000 (16:05 -0700)]
Doc change: Move butterbar css to template assets.
Change-Id: Ifa116fe304150c7c663b8088e00349ffdc69017c
Scott Main [Mon, 8 Jul 2013 22:33:42 +0000 (15:33 -0700)]
am
c9e0fac8: am
7672ccb3: am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
c9e0fac8dcc25ec84b285042af9156c6660002ae':
enable download box style for qv sidebox
The Android Open Source Project [Mon, 8 Jul 2013 22:33:42 +0000 (15:33 -0700)]
am
7e1b93cb: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
7e1b93cbd5b647db496cc587c90a012af0529dff':
"JSS08"
Scott Main [Mon, 8 Jul 2013 22:32:53 +0000 (15:32 -0700)]
am
7672ccb3: am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
7672ccb3d7ae6153c86bdd69a48db7e87e445c27':
enable download box style for qv sidebox
The Android Open Source Project [Mon, 8 Jul 2013 22:31:01 +0000 (15:31 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ifa6e38073ef648695efea3b895ef1fb64d39471e
Scott Main [Mon, 8 Jul 2013 22:28:53 +0000 (15:28 -0700)]
am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
fb2bb3d867fcdd3add7e30d1cbb6b956d3fce89e':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:27:50 +0000 (15:27 -0700)]
am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
51852a3fc1120fdad1f309613439e9b42e497318':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:25:55 +0000 (15:25 -0700)]
am
8c0f5b3a: enable download box style for qv sidebox
* commit '
8c0f5b3aefac3c824155cf883e61b021a6d8fd8f':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:12:02 +0000 (15:12 -0700)]
enable download box style for qv sidebox
Change-Id: I209e9971d886e45498aab0b4d43241ded5285f24
Lorenzo Colitti [Mon, 8 Jul 2013 21:33:12 +0000 (14:33 -0700)]
am
a6e97a31: am
b1b758f5: Don\'t build clatd without clatd.conf.
* commit '
a6e97a31df26b3e9062e9ab5342e8fd6070ffb0b':
Don't build clatd without clatd.conf.
Lorenzo Colitti [Mon, 8 Jul 2013 21:31:05 +0000 (14:31 -0700)]
am
b1b758f5: Don\'t build clatd without clatd.conf.
* commit '
b1b758f5bf30d1c6f5b0c0d5599bbe6a91d541f9':
Don't build clatd without clatd.conf.
Lorenzo Colitti [Mon, 8 Jul 2013 10:43:42 +0000 (19:43 +0900)]
Don't build clatd without clatd.conf.
Bug:
9730936
Change-Id: I2c50422c7b502d5b9bdc01afb55d25353f6c7088
The Android Automerger [Mon, 8 Jul 2013 12:56:31 +0000 (05:56 -0700)]
"JSS08"
The Android Automerger [Mon, 8 Jul 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Lorenzo Colitti [Mon, 8 Jul 2013 10:43:42 +0000 (19:43 +0900)]
Don't build clatd without clatd.conf.
Bug:
9730936
Change-Id: Id9ddf5541e894852eda8c471b9931c7c8bbbdc0a
The Android Open Source Project [Wed, 3 Jul 2013 21:12:35 +0000 (14:12 -0700)]
am
5d915283: (-s ours) Reconcile with jb-mr2-deb-factory-release - do not merge
* commit '
5d915283a1beeadb2d50da20b2864d8493a9c8d6':
JCR78H
The Android Open Source Project [Wed, 3 Jul 2013 21:10:21 +0000 (14:10 -0700)]
Reconcile with jb-mr2-deb-factory-release - do not merge
Change-Id: I8cef01a88b58eb33c82f6f6080d43490847fc377
The Android Automerger [Wed, 3 Jul 2013 19:33:56 +0000 (12:33 -0700)]
JCR78H
The Android Open Source Project [Wed, 3 Jul 2013 15:06:32 +0000 (08:06 -0700)]
am
dcaf8c34: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
dcaf8c340a18f6d2a848fc23e57b63404052ce2a':
JWR66T
The Android Open Source Project [Wed, 3 Jul 2013 14:37:08 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I04a3eda1cc82e255fe06d697a783f61d4f8ebf21
The Android Automerger [Wed, 3 Jul 2013 02:04:53 +0000 (19:04 -0700)]
JWR66T
The Android Open Source Project [Tue, 2 Jul 2013 19:41:24 +0000 (12:41 -0700)]
am
585332c9: (-s ours) Reconcile with jb-mr2-release jb-mr2-deb-factory-release jb-mr2-zeroday-release - do not merge
* commit '
585332c9e4ea588ccb310c6fa8b1137c6a6086be':
JSS02B
"JSS02"
JCR78G
"JWR66S"
JCR78F
JCR78E
The Android Open Source Project [Tue, 2 Jul 2013 19:33:17 +0000 (12:33 -0700)]
Reconcile with jb-mr2-release jb-mr2-deb-factory-release jb-mr2-zeroday-release - do not merge
Change-Id: Iae120841f91c3c12600a6f993c498f292f1cf0b2
The Android Automerger [Tue, 2 Jul 2013 18:57:14 +0000 (11:57 -0700)]
JSS02B
The Android Automerger [Tue, 2 Jul 2013 12:56:01 +0000 (05:56 -0700)]
"JSS02"
The Android Automerger [Tue, 2 Jul 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 2 Jul 2013 04:19:39 +0000 (21:19 -0700)]
JCR78G
The Android Automerger [Tue, 2 Jul 2013 01:04:27 +0000 (18:04 -0700)]
"JWR66S"
The Android Open Source Project [Tue, 2 Jul 2013 00:01:20 +0000 (17:01 -0700)]
am
29344bdf: (-s ours) Reconcile with jb-mr2-deb-factory-release - do not merge
* commit '
29344bdfd9c130fdb012f7687122828b2073741a':
JCR78D
The Android Automerger [Mon, 1 Jul 2013 23:57:31 +0000 (16:57 -0700)]
JCR78F
The Android Automerger [Mon, 1 Jul 2013 23:46:19 +0000 (16:46 -0700)]
JCR78E
The Android Open Source Project [Mon, 1 Jul 2013 22:59:13 +0000 (15:59 -0700)]
Reconcile with jb-mr2-deb-factory-release - do not merge
Change-Id: I3331bb9b846bc698339f8ce6bcf33b37d92a8074
Baligh Uddin [Mon, 1 Jul 2013 22:11:53 +0000 (15:11 -0700)]
JCR78D
The Android Open Source Project [Mon, 1 Jul 2013 14:44:19 +0000 (07:44 -0700)]
am
4886cf51: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
4886cf512df8ee5a0f60063b1a74ffddb20d2aa6':
"JSS01"
"JSR91"
JSR88C
"JWR66R"
JSR88B
The Android Open Source Project [Mon, 1 Jul 2013 14:42:15 +0000 (07:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Icaf1734bf56551758a818c0b3bbbda7a7eda0924
The Android Automerger [Mon, 1 Jul 2013 12:56:00 +0000 (05:56 -0700)]
"JSS01"
The Android Automerger [Mon, 1 Jul 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 30 Jun 2013 12:56:26 +0000 (05:56 -0700)]
"JSR91"
The Android Automerger [Sun, 30 Jun 2013 12:55:13 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 28 Jun 2013 21:57:23 +0000 (14:57 -0700)]
JSR88C
The Android Automerger [Fri, 28 Jun 2013 21:36:04 +0000 (14:36 -0700)]
"JWR66R"
Ying Wang [Fri, 28 Jun 2013 20:47:15 +0000 (13:47 -0700)]
am
f755fa0d: (-s ours) am
d235ed2a: Respect DISABLE_PROGUARD
* commit '
f755fa0d8c46a907aa457c55a8164141975467da':
Respect DISABLE_PROGUARD
Ying Wang [Fri, 28 Jun 2013 20:43:25 +0000 (13:43 -0700)]
am
d235ed2a: Respect DISABLE_PROGUARD
* commit '
d235ed2afb29101cc3e03e7bb692637ad67b48ad':
Respect DISABLE_PROGUARD
Ying Wang [Fri, 28 Jun 2013 20:37:27 +0000 (13:37 -0700)]
Respect DISABLE_PROGUARD
The flag is only used by unbundled build currently.
Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
The Android Automerger [Fri, 28 Jun 2013 12:25:50 +0000 (05:25 -0700)]
JSR88B
Brian Carlstrom [Fri, 28 Jun 2013 00:34:25 +0000 (00:34 +0000)]
Merge "Move from WITH_ART to PRODUCT_RUNTIMES"
Brian Carlstrom [Thu, 27 Jun 2013 19:02:46 +0000 (12:02 -0700)]
Move from WITH_ART to PRODUCT_RUNTIMES
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
The Android Open Source Project [Thu, 27 Jun 2013 15:12:57 +0000 (08:12 -0700)]
am
92ad5881: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
92ad5881b51c6762f71ced36b2ba34f3afe5b765':
"JSR88"
The Android Open Source Project [Thu, 27 Jun 2013 15:11:38 +0000 (08:11 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib2d247987e12acb692ade4862ebe200585bb4664
The Android Automerger [Thu, 27 Jun 2013 12:56:02 +0000 (05:56 -0700)]
"JSR88"
The Android Automerger [Thu, 27 Jun 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Ying Wang [Thu, 27 Jun 2013 00:56:08 +0000 (17:56 -0700)]
Allow to run checkbuild in sdk build.
Bug:
9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
The Android Open Source Project [Wed, 26 Jun 2013 19:37:49 +0000 (12:37 -0700)]
am
426bf5ad: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7':
"JSR87"
The Android Open Source Project [Wed, 26 Jun 2013 19:33:18 +0000 (12:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: If7ea39ba97f444cd714be425a9545ba89f4ef7f2
The Android Automerger [Wed, 26 Jun 2013 19:18:19 +0000 (12:18 -0700)]
"JSR87"
The Android Automerger [Wed, 26 Jun 2013 19:17:03 +0000 (12:17 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Brian Carlstrom [Wed, 26 Jun 2013 05:30:17 +0000 (05:30 +0000)]
Merge "Add support for dualbooting dalvik and art"
Jean-Baptiste Queru [Wed, 26 Jun 2013 00:04:17 +0000 (00:04 +0000)]
Merge "Revert "Ship Music2, not Music""
The Android Open Source Project [Wed, 26 Jun 2013 00:02:15 +0000 (17:02 -0700)]
am
90aa9d84: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
90aa9d848485a9209e80b1beadecf8dd3ba3553c':
JWR66Q
"JSR85"
JSR78D
Ying Wang [Wed, 26 Jun 2013 00:01:52 +0000 (17:01 -0700)]
am
4c4b6b2a: am
f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk
* commit '
4c4b6b2a0bcfe662a6954e6d63cebe4a39fc5de1':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Brian Carlstrom [Mon, 24 Jun 2013 17:16:03 +0000 (10:16 -0700)]
Add support for dualbooting dalvik and art
Change-Id: I39bc909bf9ba2c8e4dc6599c84e5a6c780def43d
Jean-Baptiste Queru [Tue, 25 Jun 2013 23:33:44 +0000 (16:33 -0700)]
Revert "Ship Music2, not Music"
This reverts commit
1ad24f57a1a3949dfc1e5bf19f661df1bd08c080.
Bug:
9518830
Change-Id: I3cfe98b418512d4d396c4528b98b978cf5bc3c30
The Android Open Source Project [Tue, 25 Jun 2013 23:10:44 +0000 (16:10 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ibbe777e000d41acd338e396199bb93e652b38d26
The Android Automerger [Tue, 25 Jun 2013 22:11:07 +0000 (15:11 -0700)]
JWR66Q
Ying Wang [Tue, 25 Jun 2013 21:13:09 +0000 (14:13 -0700)]
am
f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk
* commit '
f84bf8d0ca954e7a0768cb5c0d1024fa26a72756':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Ying Wang [Tue, 25 Jun 2013 19:34:11 +0000 (12:34 -0700)]
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
(cherry picked from commit
8578cab0667cf3a3da263d838e29b07060af9ba7)
Ying Wang [Tue, 25 Jun 2013 19:34:11 +0000 (12:34 -0700)]
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
Justin Ho [Mon, 24 Jun 2013 23:21:29 +0000 (23:21 +0000)]
Merge "Ship Music2, not Music Bug:
9518830"
Justin Ho [Mon, 24 Jun 2013 23:06:11 +0000 (16:06 -0700)]
Ship Music2, not Music
Bug:
9518830
Change-Id: Ic0d696a958592e67bb3fc0580e9bd717b927d36b
Ben Cheng [Mon, 24 Jun 2013 22:02:31 +0000 (22:02 +0000)]
Merge "Source $ANDROID_BUILD_TOP/development/scripts/gdb/dalvik.gdb"
The Android Automerger [Mon, 24 Jun 2013 21:55:38 +0000 (14:55 -0700)]
"JSR85"
The Android Automerger [Mon, 24 Jun 2013 21:55:02 +0000 (14:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 24 Jun 2013 21:44:20 +0000 (14:44 -0700)]
JSR78D
The Android Automerger [Mon, 24 Jun 2013 21:41:25 +0000 (14:41 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
Ben Cheng [Mon, 24 Jun 2013 21:36:21 +0000 (14:36 -0700)]
Source $ANDROID_BUILD_TOP/development/scripts/gdb/dalvik.gdb
Example for future gdb scripts: A handy command "dbt" is
added to unwind the Dalvik stack.
Change-Id: I564ec865c30453879439203d9d15623d5f1ec235
The Android Automerger [Mon, 24 Jun 2013 21:34:42 +0000 (14:34 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
The Android Open Source Project [Mon, 24 Jun 2013 18:50:02 +0000 (11:50 -0700)]
am
2ca8825a: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
2ca8825aff762b5657f4f0b661bf20c7e2957c60':
JSR82B
The Android Open Source Project [Mon, 24 Jun 2013 18:44:56 +0000 (11:44 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I96ddc0a7186ed26fd445bc47a16c7c03a3d7c846
Svetoslav Ganov [Wed, 3 Apr 2013 20:59:53 +0000 (13:59 -0700)]
Print - build
Change-Id: I640adcc41697e609ed324bd1f1dd032e20df4933
The Android Automerger [Fri, 21 Jun 2013 22:39:44 +0000 (15:39 -0700)]
JSR82B
The Android Open Source Project [Fri, 21 Jun 2013 18:58:19 +0000 (11:58 -0700)]
am
70b89b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
70b89b2bb95022a182437996697cce7c15e6d8a7':
"JSR82"
The Android Open Source Project [Fri, 21 Jun 2013 18:56:38 +0000 (11:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I38129dc3a8a50f254dbe8155736f45f247deb1af
The Android Automerger [Fri, 21 Jun 2013 18:37:27 +0000 (11:37 -0700)]
"JSR82"
The Android Automerger [Fri, 21 Jun 2013 18:35:04 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Ying Wang [Fri, 21 Jun 2013 17:44:47 +0000 (10:44 -0700)]
am
c012edbc: am
42aaacf1: am
a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
* commit '
c012edbc519b74456530c26719133f96d4574de3':
Do not use -msynci flag for Xburst 4780 cores
Ying Wang [Fri, 21 Jun 2013 17:42:32 +0000 (10:42 -0700)]
am
42aaacf1: am
a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
* commit '
42aaacf183b0ee7af989d2fce1d8b29401dfb61a':
Do not use -msynci flag for Xburst 4780 cores
Ying Wang [Fri, 21 Jun 2013 17:37:38 +0000 (10:37 -0700)]
am
a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
* commit '
a90d7eb64fc3155c6558d9c307e0bc4a2d84dff9':
Do not use -msynci flag for Xburst 4780 cores
Ying Wang [Fri, 21 Jun 2013 17:35:50 +0000 (17:35 +0000)]
Merge "Do not use -msynci flag for Xburst 4780 cores"
The Android Open Source Project [Fri, 21 Jun 2013 00:34:07 +0000 (17:34 -0700)]
am
63ddacee: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
63ddacee4d068bf243104ceb3031dc15987eda90':
JWR66P
JSR78C
The Android Open Source Project [Fri, 21 Jun 2013 00:31:51 +0000 (17:31 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I5ed80e588eaaed9872e22aa2c0a362723a698f3a
Brian Carlstrom [Thu, 20 Jun 2013 23:54:20 +0000 (23:54 +0000)]
Merge "Add WITH_ART support to product definitions"
OSDN Git Service
