Ying Wang
f755fa0d8c
am d235ed2a: Respect DISABLE_PROGUARD
...
* commit 'd235ed2afb29101cc3e03e7bb692637ad67b48ad':
Respect DISABLE_PROGUARD
2013-06-28 13:43:25 -07:00
Ying Wang
d235ed2afb
Respect DISABLE_PROGUARD
...
The flag is only used by unbundled build currently.
Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
2013-06-28 13:37:27 -07:00
The Android Automerger
bbb986b22d
JSR88B
2013-06-28 05:25:50 -07:00
Brian Carlstrom
7e4820dc5c
Merge "Move from WITH_ART to PRODUCT_RUNTIMES"
2013-06-28 00:34:25 +00:00
Brian Carlstrom
1aeee8bb66
Move from WITH_ART to PRODUCT_RUNTIMES
...
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
2013-06-27 16:49:15 -07:00
The Android Open Source Project
1ac3b30754
am 92ad5881: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '92ad5881b51c6762f71ced36b2ba34f3afe5b765':
"JSR88"
2013-06-27 08:12:57 -07:00
The Android Open Source Project
92ad5881b5
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Ib2d247987e12acb692ade4862ebe200585bb4664
2013-06-27 08:11:38 -07:00
The Android Automerger
3963f3cbe0
"JSR88"
2013-06-27 05:56:02 -07:00
The Android Automerger
203a5ed738
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-27 05:55:09 -07:00
Ying Wang
fcec57a116
Allow to run checkbuild in sdk build.
...
Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
2013-06-26 18:00:17 -07:00
The Android Open Source Project
2ff37b246a
am 426bf5ad: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7':
"JSR87"
2013-06-26 12:37:49 -07:00
The Android Open Source Project
426bf5adf0
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: If7ea39ba97f444cd714be425a9545ba89f4ef7f2
2013-06-26 12:33:18 -07:00
The Android Automerger
69fb023e61
"JSR87"
2013-06-26 12:18:19 -07:00
The Android Automerger
74d23ec41e
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-26 12:17:03 -07:00
Brian Carlstrom
a4ba587282
Merge "Add support for dualbooting dalvik and art"
2013-06-26 05:30:18 +00:00
Jean-Baptiste Queru
3ba9cb2439
Merge "Revert "Ship Music2, not Music""
2013-06-26 00:04:17 +00:00
The Android Open Source Project
765e8eec57
am 90aa9d84: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '90aa9d848485a9209e80b1beadecf8dd3ba3553c':
JWR66Q
"JSR85"
JSR78D
2013-06-25 17:02:15 -07:00
Ying Wang
01554fc890
am 4c4b6b2a: am f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
* commit '4c4b6b2a0bcfe662a6954e6d63cebe4a39fc5de1':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
2013-06-25 17:01:52 -07:00
Brian Carlstrom
3d0507d3a1
Add support for dualbooting dalvik and art
...
Change-Id: I39bc909bf9ba2c8e4dc6599c84e5a6c780def43d
2013-06-25 16:36:53 -07:00
Jean-Baptiste Queru
dc31ccab64
Revert "Ship Music2, not Music"
...
This reverts commit 1ad24f57a1
.
Bug: 9518830
Change-Id: I3cfe98b418512d4d396c4528b98b978cf5bc3c30
2013-06-25 16:34:00 -07:00
The Android Open Source Project
90aa9d8484
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: Ibbe777e000d41acd338e396199bb93e652b38d26
2013-06-25 16:10:44 -07:00
The Android Automerger
627c2b2fcb
JWR66Q
2013-06-25 15:11:07 -07:00
Ying Wang
4c4b6b2a0b
am f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk
...
* commit 'f84bf8d0ca954e7a0768cb5c0d1024fa26a72756':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
2013-06-25 14:13:09 -07:00
Ying Wang
f84bf8d0ca
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 8578cab066
)
2013-06-25 21:05:11 +00:00
Ying Wang
8578cab066
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
2013-06-25 12:34:11 -07:00
Justin Ho
e18ee4606b
Merge "Ship Music2, not Music Bug: 9518830"
2013-06-24 23:21:29 +00:00
Justin Ho
1ad24f57a1
Ship Music2, not Music
...
Bug: 9518830
Change-Id: Ic0d696a958592e67bb3fc0580e9bd717b927d36b
2013-06-24 16:06:11 -07:00
Ben Cheng
5f10b40d74
Merge "Source $ANDROID_BUILD_TOP/development/scripts/gdb/dalvik.gdb"
2013-06-24 22:02:31 +00:00
The Android Automerger
d829e5c450
"JSR85"
2013-06-24 14:55:38 -07:00
The Android Automerger
1713bf7170
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-24 14:55:02 -07:00
The Android Automerger
4027d0ebbd
JSR78D
2013-06-24 14:44:20 -07:00
The Android Automerger
0fec6c3d4e
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
2013-06-24 14:41:25 -07:00
Ben Cheng
7239816079
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
2013-06-24 14:36:21 -07:00
The Android Automerger
0823a134fe
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
2013-06-24 14:34:42 -07:00
The Android Open Source Project
b7739c14d7
am 2ca8825a: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '2ca8825aff762b5657f4f0b661bf20c7e2957c60':
JSR82B
2013-06-24 11:50:02 -07:00
The Android Open Source Project
2ca8825aff
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I96ddc0a7186ed26fd445bc47a16c7c03a3d7c846
2013-06-24 11:44:56 -07:00
Svetoslav Ganov
0402a4b12c
Print - build
...
Change-Id: I640adcc41697e609ed324bd1f1dd032e20df4933
2013-06-21 17:33:18 -07:00
The Android Automerger
5c59dc6798
JSR82B
2013-06-21 15:39:44 -07:00
The Android Open Source Project
971a3797f6
am 70b89b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '70b89b2bb95022a182437996697cce7c15e6d8a7':
"JSR82"
2013-06-21 11:58:19 -07:00
The Android Open Source Project
70b89b2bb9
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I38129dc3a8a50f254dbe8155736f45f247deb1af
2013-06-21 11:56:38 -07:00
The Android Automerger
3b1ec02875
"JSR82"
2013-06-21 11:37:27 -07:00
The Android Automerger
85405f72d1
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-21 11:35:04 -07:00
Ying Wang
10e41c3275
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
2013-06-21 10:44:47 -07:00
Ying Wang
c012edbc51
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
2013-06-21 10:42:32 -07:00
Ying Wang
42aaacf183
am a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
...
* commit 'a90d7eb64fc3155c6558d9c307e0bc4a2d84dff9':
Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:37:38 -07:00
Ying Wang
a90d7eb64f
Merge "Do not use -msynci flag for Xburst 4780 cores"
2013-06-21 17:35:51 +00:00
The Android Open Source Project
73c5a6f934
am 63ddacee: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '63ddacee4d068bf243104ceb3031dc15987eda90':
JWR66P
JSR78C
2013-06-20 17:34:07 -07:00
The Android Open Source Project
63ddacee4d
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I5ed80e588eaaed9872e22aa2c0a362723a698f3a
2013-06-20 17:31:51 -07:00
Brian Carlstrom
33a0d8b1cb
Merge "Add WITH_ART support to product definitions"
2013-06-20 23:54:21 +00:00
Raghu Gandham
6faf71647a
Do not use -msynci flag for Xburst 4780 cores
...
synci does not provide coherency between CPU's on this device
Change-Id: I10e73fa49859e55d018884c6682b5a00b887e0a1
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>
2013-06-20 13:29:49 -07:00