OSDN Git Service
Brian Carlstrom [Sat, 4 May 2013 01:10:48 +0000 (18:10 -0700)]
am
eb4859a1: am
f7e2a548: Merge "Remove duplicate LOCAL_MODULE_TAGS"
* commit '
eb4859a1908996a16272f2a9e506c896cec68e0d':
Remove duplicate LOCAL_MODULE_TAGS
Brian Carlstrom [Sat, 4 May 2013 01:08:33 +0000 (18:08 -0700)]
am
f7e2a548: Merge "Remove duplicate LOCAL_MODULE_TAGS"
* commit '
f7e2a54823232a9cc249f799e666547fac0ab27d':
Remove duplicate LOCAL_MODULE_TAGS
Brian Carlstrom [Sat, 4 May 2013 00:57:13 +0000 (17:57 -0700)]
am
983a1f14: am
ee48f542: Merge "Fix bad whitespace alignment from LOGW to ALOGW change"
* commit '
983a1f14f507843d20d2a9096c6fc2211ac3f225':
Fix bad whitespace alignment from LOGW to ALOGW change
Brian Carlstrom [Sat, 4 May 2013 00:54:40 +0000 (00:54 +0000)]
Merge "Remove duplicate LOCAL_MODULE_TAGS"
Brian Carlstrom [Sat, 4 May 2013 00:53:50 +0000 (17:53 -0700)]
am
70b4848f: resolved conflicts for merge of
c7f23a58 to jb-mr2-dev-plus-aosp
* commit '
70b4848fe3b18bc848d1963b709aeb078c9c464c':
Remove dx's copy of JUnit. (part II)
Brian Carlstrom [Sat, 4 May 2013 00:53:01 +0000 (17:53 -0700)]
am
ee48f542: Merge "Fix bad whitespace alignment from LOGW to ALOGW change"
* commit '
ee48f5425c14da39e498f08b9529025fa96d62fb':
Fix bad whitespace alignment from LOGW to ALOGW change
Brian Carlstrom [Sat, 4 May 2013 00:51:51 +0000 (17:51 -0700)]
Remove duplicate LOCAL_MODULE_TAGS
Change-Id: Ib2076dedc066dab0f71b038d84edd6b60565c211
Brian Carlstrom [Sat, 4 May 2013 00:50:05 +0000 (17:50 -0700)]
resolved conflicts for merge of
c7f23a58 to jb-mr2-dev-plus-aosp
Change-Id: Ic1ff892898884326151d02a53c15f5bb4bb57c28
Brian Carlstrom [Sat, 4 May 2013 00:35:02 +0000 (00:35 +0000)]
Merge "Fix bad whitespace alignment from LOGW to ALOGW change"
Brian Carlstrom [Sat, 4 May 2013 00:31:16 +0000 (17:31 -0700)]
Fix bad whitespace alignment from LOGW to ALOGW change
Change-Id: I8eba74b92976f433aff42e6c4461e3127e519d77
Brian Carlstrom [Sat, 4 May 2013 00:20:51 +0000 (00:20 +0000)]
Merge "Remove dx's copy of JUnit. (part II)"
Jesse Wilson [Fri, 9 Dec 2011 19:33:21 +0000 (14:33 -0500)]
Remove dx's copy of JUnit. (part II)
This is a second attempt to cherry-pick
4cd7b39876bcec03bb1d0c2afa61cbdb7d119eba
because a couple things didn't come through last time.
Change-Id: I12e5340f0504c1d875d3e4bbe23d8d5506f72fe6
Brian Carlstrom [Fri, 3 May 2013 23:11:58 +0000 (16:11 -0700)]
am
1634c64c: am
34e2dd66: Merge "Define scripts for calling DexMerger."
* commit '
1634c64ce162d79aad96a7d7ca82fa0f750d5df6':
Define scripts for calling DexMerger.
Brian Carlstrom [Fri, 3 May 2013 23:10:13 +0000 (16:10 -0700)]
am
34e2dd66: Merge "Define scripts for calling DexMerger."
* commit '
34e2dd664631a974fbf92d0ad291e22d332f84cb':
Define scripts for calling DexMerger.
Brian Carlstrom [Fri, 3 May 2013 22:58:24 +0000 (15:58 -0700)]
am
b0711854: am
69fcce64: Merge "Print proto_ids_{size,off} along with the rest of the header."
* commit '
b0711854c098f17630f6f0582d098397c19b128a':
Print proto_ids_{size,off} along with the rest of the header.
Brian Carlstrom [Fri, 3 May 2013 22:57:41 +0000 (22:57 +0000)]
Merge "Define scripts for calling DexMerger."
Brian Carlstrom [Fri, 3 May 2013 22:53:35 +0000 (15:53 -0700)]
am
69fcce64: Merge "Print proto_ids_{size,off} along with the rest of the header."
* commit '
69fcce644574d25339a71cfe2c9821bbfaf8b731':
Print proto_ids_{size,off} along with the rest of the header.
yroussel [Fri, 26 Oct 2012 14:33:53 +0000 (16:33 +0200)]
Define scripts for calling DexMerger.
(cherry picked from commit
4f00f32e39f04b5b7ba6684ee3914d9904a139d5)
Change-Id: I86cedb9f48bbb8f7f1945f86b9e10bc2f37a24b9
Brian Carlstrom [Fri, 3 May 2013 22:38:08 +0000 (15:38 -0700)]
am
76f39218: am
1f7ec2be: Merge "Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES"
* commit '
76f392185ce17839c58a1d10d9c5eb5a338f9f0d':
Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES
Brian Carlstrom [Fri, 3 May 2013 22:37:17 +0000 (22:37 +0000)]
Merge "Print proto_ids_{size,off} along with the rest of the header."
Brian Carlstrom [Fri, 3 May 2013 22:35:55 +0000 (15:35 -0700)]
am
1f7ec2be: Merge "Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES"
* commit '
1f7ec2be2473a0becba97d2d12ccc992b993f7b7':
Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES
Carl Shapiro [Thu, 4 Aug 2011 02:38:17 +0000 (19:38 -0700)]
Print proto_ids_{size,off} along with the rest of the header.
(cherry picked from commit
6e5f79ce9af380d12238a4ed958cdb56e5490ced)
Change-Id: Ie1df9e0f23d8f5fcea4b6ed7487c61a8182e1a65
Brian Carlstrom [Fri, 3 May 2013 22:30:15 +0000 (22:30 +0000)]
Merge "Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES"
Brian Carlstrom [Fri, 3 May 2013 22:23:47 +0000 (15:23 -0700)]
Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES
Change-Id: I463a62898e5dd8eb01d1dfbaf71f67d8e1b4e67c
Elliott Hughes [Fri, 3 May 2013 22:08:55 +0000 (15:08 -0700)]
am
aac1a7b9: Revert "Revert "Tiny optimization for complier templates for arm.""
* commit '
aac1a7b997b54f53e900b5163d417e1aee9243a4':
Revert "Revert "Tiny optimization for complier templates for arm.""
Elliott Hughes [Fri, 3 May 2013 21:54:09 +0000 (14:54 -0700)]
am
38a473c6: am
0bc4a058: Merge "Fix dalvik tests post-conscrypt."
* commit '
38a473c6c8cc7fbb17f4b0ea7401afb8063b7bf6':
Fix dalvik tests post-conscrypt.
Elliott Hughes [Fri, 3 May 2013 21:54:08 +0000 (14:54 -0700)]
am
0b512ff7: am
0d5f6f6e: Merge "Fix some leaks in VfyBasicBlock & BitVector."
* commit '
0b512ff705cfc8c5e908eb5d67f45451f48dbed0':
Fix some leaks in VfyBasicBlock & BitVector.
Elliott Hughes [Fri, 3 May 2013 20:39:53 +0000 (13:39 -0700)]
Revert "Revert "Tiny optimization for complier templates for arm.""
This reverts commit
4afb260cf1f312382541e30cab5766bff890e6fe.
Elliott Hughes [Fri, 3 May 2013 19:17:50 +0000 (12:17 -0700)]
am
0bc4a058: Merge "Fix dalvik tests post-conscrypt."
* commit '
0bc4a05819575824bde922e713146337f7cb5eec':
Fix dalvik tests post-conscrypt.
Elliott Hughes [Fri, 3 May 2013 19:17:49 +0000 (12:17 -0700)]
am
0d5f6f6e: Merge "Fix some leaks in VfyBasicBlock & BitVector."
* commit '
0d5f6f6e7099f737cbc28611d9a96218d0149e05':
Fix some leaks in VfyBasicBlock & BitVector.
Elliott Hughes [Fri, 3 May 2013 18:55:51 +0000 (18:55 +0000)]
Merge "Fix dalvik tests post-conscrypt."
Elliott Hughes [Fri, 3 May 2013 18:54:59 +0000 (11:54 -0700)]
Fix dalvik tests post-conscrypt.
Change-Id: I36b942916330a3d6a06fad93dd9aa0533b47ff85
Elliott Hughes [Fri, 3 May 2013 18:54:34 +0000 (18:54 +0000)]
Merge "Fix some leaks in VfyBasicBlock & BitVector."
You Kim [Wed, 3 Apr 2013 19:24:20 +0000 (04:24 +0900)]
Fix some leaks in VfyBasicBlock & BitVector.
Change-Id: I20050135588fc96268911b8ab690b04c8ad949bc
Raphaël Moll [Fri, 3 May 2013 03:31:41 +0000 (20:31 -0700)]
am
b5f5c149: am
7dc0b702: Merge "Fix dx to match the new SDK structure."
* commit '
b5f5c149ce450f42e92e1ed22a7d106f99591ecd':
Fix dx to match the new SDK structure.
Raphaël Moll [Fri, 3 May 2013 03:30:23 +0000 (20:30 -0700)]
am
7dc0b702: Merge "Fix dx to match the new SDK structure."
* commit '
7dc0b702819701bbda50ff23670c01f9ea3cc646':
Fix dx to match the new SDK structure.
Raphaël Moll [Fri, 3 May 2013 03:18:41 +0000 (03:18 +0000)]
Merge "Fix dx to match the new SDK structure."
buzbee [Fri, 3 May 2013 00:43:46 +0000 (17:43 -0700)]
am
3f354507: am
f85b49fe: Fix JIT initialization race
* commit '
3f35450707fbd201cd213c64b5823f848a2197a0':
Fix JIT initialization race
buzbee [Fri, 3 May 2013 00:41:30 +0000 (17:41 -0700)]
am
f85b49fe: Fix JIT initialization race
* commit '
f85b49fedc9367dfc0554a2b27115e046cc4dfec':
Fix JIT initialization race
Raphael Moll [Thu, 2 May 2013 22:40:16 +0000 (15:40 -0700)]
am
0fb3ee92: am
315197f3: Merge "Fix dx.bat to match the new SDK structure."
* commit '
0fb3ee92fa00929fc865d4112f9402d29cc12ab5':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Thu, 2 May 2013 22:38:10 +0000 (15:38 -0700)]
am
315197f3: Merge "Fix dx.bat to match the new SDK structure."
* commit '
315197f351a4d49a64c90cf28e6c02677b37868e':
Fix dx.bat to match the new SDK structure.
Xavier Ducrohet [Tue, 26 Mar 2013 17:24:05 +0000 (10:24 -0700)]
Fix dx to match the new SDK structure.
(cherry picked from commit
cb9dfa123c6fcc43be629666837c4e6f86b476ea)
Change-Id: I071d73adc4a2eb812cdbc204d27884f4a527043d
Raphael Moll [Thu, 2 May 2013 22:14:50 +0000 (22:14 +0000)]
Merge "Fix dx.bat to match the new SDK structure."
buzbee [Wed, 1 May 2013 17:22:28 +0000 (10:22 -0700)]
Fix JIT initialization race
See b/
8767735 Slow thread in thread spin test
A race exists in thread creation/JIT initialization that can
leave the JIT permanantly disabled for a thread (typically
the first interpreter thread).
(cherry-pick from master If6fcac93a229edf068eb02ceceb374e3dc284b78)
Change-Id: I120af6f753984d63d43122ea30db102bd1d5cc63
Brian Carlstrom [Thu, 2 May 2013 16:14:42 +0000 (09:14 -0700)]
am
77408553: am
11cadca4: Merge "Tracking changes to *-host for host shared libraries"
* commit '
774085534cea109b3df26536ae956ffd47123310':
Tracking changes to *-host for host shared libraries
Brian Carlstrom [Thu, 2 May 2013 16:13:09 +0000 (09:13 -0700)]
am
11cadca4: Merge "Tracking changes to *-host for host shared libraries"
* commit '
11cadca43899aa166e7d68bbaddeb2481d704454':
Tracking changes to *-host for host shared libraries
Brian Carlstrom [Thu, 2 May 2013 16:08:06 +0000 (16:08 +0000)]
Merge "Tracking changes to *-host for host shared libraries"
Brian Carlstrom [Thu, 2 May 2013 04:53:49 +0000 (21:53 -0700)]
Tracking changes to *-host for host shared libraries
Change-Id: I764889011cc259cdca306e2145bcc4c8c75eced5
Elliott Hughes [Wed, 1 May 2013 21:08:30 +0000 (14:08 -0700)]
am
e4dc5e39: am
6e3adcc6: Merge "Fix JIT initialization race"
* commit '
e4dc5e399c7f43c27c386567c4d39f6694631913':
Fix JIT initialization race
Elliott Hughes [Wed, 1 May 2013 21:04:56 +0000 (14:04 -0700)]
am
6e3adcc6: Merge "Fix JIT initialization race"
* commit '
6e3adcc6036858531ec41bea8b2ca3b9980d6413':
Fix JIT initialization race
Elliott Hughes [Wed, 1 May 2013 20:57:13 +0000 (20:57 +0000)]
Merge "Fix JIT initialization race"
buzbee [Wed, 1 May 2013 17:22:28 +0000 (10:22 -0700)]
Fix JIT initialization race
See b/
8767735 Slow thread in thread spin test
A race exists in thread creation/JIT initialization that can
leave the JIT permanantly disabled for a thread (typically
the first interpreter thread).
(cherry-pick of
67985d960f5c877f86d0bba251d2d55c7a062b8d.)
Change-Id: Ic7e3a1cde2833ac78455fa5d465156b5e0896fc1
buzbee [Wed, 1 May 2013 17:34:08 +0000 (17:34 +0000)]
Merge "Fix JIT initialization race"
buzbee [Wed, 1 May 2013 17:22:28 +0000 (10:22 -0700)]
Fix JIT initialization race
See b/
8767735 Slow thread in thread spin test
A race exists in thread creation/JIT initialization that can
leave the JIT permanantly disabled for a thread (typically
the first interpreter thread).
Change-Id: If6fcac93a229edf068eb02ceceb374e3dc284b78
Brian Carlstrom [Wed, 1 May 2013 01:14:45 +0000 (18:14 -0700)]
am
8f6082b4: am
15554a2f: Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"
* commit '
8f6082b4b95297f8ed31cd2ba78dc242c797a53c':
Update dalvik host script for new conscrypt and okhttp classpath entries
Brian Carlstrom [Wed, 1 May 2013 01:12:28 +0000 (18:12 -0700)]
am
15554a2f: Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"
* commit '
15554a2f2d4920357f6cf1a0505a178de3781f77':
Update dalvik host script for new conscrypt and okhttp classpath entries
Brian Carlstrom [Wed, 1 May 2013 00:57:28 +0000 (00:57 +0000)]
Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"
Brian Carlstrom [Wed, 1 May 2013 00:51:03 +0000 (17:51 -0700)]
Update dalvik host script for new conscrypt and okhttp classpath entries
Change-Id: I9af7dfeb7387544bff98af55716f3db9808e39cb
Brian Carlstrom [Tue, 30 Apr 2013 23:30:19 +0000 (16:30 -0700)]
am
ab02e3b7: am
b66781c5: Merge changes I3ef1ad8c,I0bbbba1a,Ife107fb6,Ia420b766
* commit '
ab02e3b7315815dae27ace117a817c91e3e04ad1':
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Move dex utilities from dalvik/dx to libcore/dex
Mechanical refactoring of dx into two parts.
Change com.android.dx.io.Annotation to use EncodedValue
Brian Carlstrom [Tue, 30 Apr 2013 23:30:18 +0000 (16:30 -0700)]
am
ac756fd6: am
71cf82a3: Merge "Teach dex how to parse encoded values from .dex files."
* commit '
ac756fd6d688e22efe771af236b6bca0327287d0':
Teach dex how to parse encoded values from .dex files.
Brian Carlstrom [Tue, 30 Apr 2013 23:25:10 +0000 (16:25 -0700)]
am
b66781c5: Merge changes I3ef1ad8c,I0bbbba1a,Ife107fb6,Ia420b766
* commit '
b66781c5bf4da1f6fdcbc5a1fcd2c962294b661c':
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Move dex utilities from dalvik/dx to libcore/dex
Mechanical refactoring of dx into two parts.
Change com.android.dx.io.Annotation to use EncodedValue
Brian Carlstrom [Tue, 30 Apr 2013 23:25:09 +0000 (16:25 -0700)]
am
71cf82a3: Merge "Teach dex how to parse encoded values from .dex files."
* commit '
71cf82a34cdd9b22ca9000575ab490a9a2c13cc8':
Teach dex how to parse encoded values from .dex files.
Brian Carlstrom [Tue, 30 Apr 2013 21:45:35 +0000 (21:45 +0000)]
Merge changes I3ef1ad8c,I0bbbba1a,Ife107fb6,Ia420b766
* changes:
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Move dex utilities from dalvik/dx to libcore/dex
Mechanical refactoring of dx into two parts.
Change com.android.dx.io.Annotation to use EncodedValue
Brian Carlstrom [Tue, 30 Apr 2013 21:45:26 +0000 (21:45 +0000)]
Merge "Teach dex how to parse encoded values from .dex files."
Jesse Wilson [Mon, 19 Sep 2011 02:45:39 +0000 (22:45 -0400)]
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Change-Id: Ifd3672027d075b6c9f8df208a04bc33122c883af
(cherry picked from commit
f8357511efd16d76ce4410459c15dbb08b0140b6)
Conflicts:
dx/src/com/android/dx/merge/DexMerger.java
Jesse Wilson [Sun, 18 Sep 2011 16:53:38 +0000 (12:53 -0400)]
Move dex utilities from dalvik/dx to libcore/dex
Change-Id: If0022a069ba3ac51ae5cdc4b0eabb6b913cd8afe
(cherry picked from commit
7b13a4d41243f81fe80a76e2ff2f877b53610446)
Conflicts:
dx/src/com/android/dex/Code.java
dx/src/com/android/dex/Dex.java
dx/src/com/android/dex/SizeOf.java
dx/src/com/android/dex/TableOfContents.java
Jesse Wilson [Sat, 17 Sep 2011 03:10:02 +0000 (23:10 -0400)]
Mechanical refactoring of dx into two parts.
This splits off a new package, com.android.dex that contains
code for parsing and modelling dex files. This code is usable
both at build time (for compilation and analysis) and at runtime
(for introspection).
The original package, com.android.dx is the tool that compiles
.class files into .dex files. That package also includes utilities
for merging and querying dex files, all visible to the dx command
line application.
In a follow up change I'll move the new com.android.dex package
into the libcore/ project, and configure build rules so that it's
included in both dx.jar and core.jar. The core.jar will then be
able to use it for annotation processing.
Change-Id: I3c58cf87e728e4dda1925a0992c1ee7b8130e81a
(cherry picked from commit
bab4abb07335d162ecdb8091fc395cf84803a580)
Conflicts:
dx/junit-tests/com/android/dx/util/BitIntSetTest.java
dx/junit-tests/com/android/dx/util/BitsTest.java
dx/junit-tests/com/android/dx/util/IntListTest.java
dx/junit-tests/com/android/dx/util/ListIntSetTest.java
dx/src/com/android/dex/Dex.java
dx/src/com/android/dex/TableOfContents.java
dx/src/com/android/dx/annotations/AnnotationAccess.java
dx/src/com/android/dx/command/Main.java
dx/src/com/android/dx/dex/code/OutputFinisher.java
dx/src/com/android/dx/dex/code/form/Form32s.java
dx/src/com/android/dx/dex/code/form/Form33x.java
dx/src/com/android/dx/dex/code/form/Form41c.java
dx/src/com/android/dx/dex/code/form/Form52c.java
dx/src/com/android/dx/gen/DexGenerator.java
dx/src/com/android/dx/merge/DexMerger.java
Brian Carlstrom [Tue, 30 Apr 2013 01:26:09 +0000 (18:26 -0700)]
Change com.android.dx.io.Annotation to use EncodedValue
(cherry picked from commit
4ec022b0b6c84f994ab2fc78934110ad96d0bdec)
Change-Id: Ia420b7661f372c59af8fe62bdab7982a1d2b008f
Jesse Wilson [Thu, 15 Sep 2011 19:49:25 +0000 (15:49 -0400)]
Teach dex how to parse encoded values from .dex files.
Previously primitive values were treated as opaque byte arrays.
Now the encoded values can be interpreted as their proper types:
integers, indices, floats, chars, etc. This gets complicated
pretty fast due to the dense packing dx performs when encoding
the values.
The encoding code is moved from ValueEncoder. The decoding code
is ported from C++ to Java from Annotation.cpp.
There's a bunch of new tests to make sure the decoding is correct;
porting from C++ to Java was tricky because of the '>>' shifts on
unsigned values. The test input data is generated by dex!
Change-Id: I83b2fc3e16115d667fa94b3dab782d1a9687f3ad
(cherry picked from commit
27847605b9255358f0577ffec28886c450263898)
Elliott Hughes [Fri, 26 Apr 2013 17:46:48 +0000 (10:46 -0700)]
am
f174237b: am
33a977ec: Merge "Fix JIT bug related to immediate doubles"
* commit '
f174237b3c2b81d4ef17023022cb891f20dec4e9':
Fix JIT bug related to immediate doubles
Elliott Hughes [Fri, 26 Apr 2013 17:44:59 +0000 (10:44 -0700)]
am
33a977ec: Merge "Fix JIT bug related to immediate doubles"
* commit '
33a977ec6a12deb22bcc87f8c294439b3aba16ab':
Fix JIT bug related to immediate doubles
Elliott Hughes [Fri, 26 Apr 2013 17:37:22 +0000 (17:37 +0000)]
Merge "Fix JIT bug related to immediate doubles"
buzbee [Tue, 12 Feb 2013 00:52:31 +0000 (16:52 -0800)]
Fix JIT bug related to immediate doubles
Change 256211 (JIT: Performance Fix for const doubles) introduced a
defect that can cause the JIT to use the wrong floating point
double constant in traces in which the following conditions hold:
o Two (or more) different 64-bit floating point constants are used.
o The physical register holding the first constant is still live
at the time the second constant is used.
o The low 32 bits of the two constants are identical.
In this situation, the load/copy optimization pass will incorrectly
determine that the two constants are the same, delete the load of
the second constant and re-use the first constant value.
Note: this problem only occurs with 64-bit floating point literals.
64-bit long literals are unaffected.
This CL works around the problem, and a subsequent CL will rework
disambiguation of 64-bit immediates in a somewhat cleaner fashion.
(cherry-pick of
c1757a6deab0ca0bfd42c38612d92b2f26c41dbe.)
Change-Id: I795b4b753550d2745cbbdd83ae25f4a7088990f6
Elliott Hughes [Thu, 25 Apr 2013 20:50:31 +0000 (13:50 -0700)]
am
32652a25: am
3b79b5bf: Merge "Don\'t duplicate annotation set ref lists when merging."
* commit '
32652a25dd2e67c0931d7cbaeb48c80f4ff95131':
Don't duplicate annotation set ref lists when merging.
Elliott Hughes [Thu, 25 Apr 2013 18:50:36 +0000 (11:50 -0700)]
am
3b79b5bf: Merge "Don\'t duplicate annotation set ref lists when merging."
* commit '
3b79b5bf70941a6da52ea8c5d50b0dcdb296a99f':
Don't duplicate annotation set ref lists when merging.
Elliott Hughes [Thu, 25 Apr 2013 18:36:21 +0000 (18:36 +0000)]
Merge "Don't duplicate annotation set ref lists when merging."
Xavier Ducrohet [Thu, 25 Apr 2013 02:13:41 +0000 (19:13 -0700)]
am
bdcaa60b: am
9b4204c1: am
33b5dfb6: am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
bdcaa60b82002bed3465f54bb63117aef250a67f':
Fix dx to match the new SDK structure.
Xavier Ducrohet [Thu, 25 Apr 2013 02:11:19 +0000 (19:11 -0700)]
am
9b4204c1: am
33b5dfb6: am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
9b4204c1e265ad8b8c4fe4e671f91d1cd0e4ab4e':
Fix dx to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:10:18 +0000 (19:10 -0700)]
am
73b626c8: am
bfae1ee4: Merge "Fix dx.bat to match the new SDK structure." into jb-mr2-dev
* commit '
73b626c8a27dd3b3c6ec3c906152050e46cbf771':
Fix dx.bat to match the new SDK structure.
Xavier Ducrohet [Thu, 25 Apr 2013 02:09:32 +0000 (19:09 -0700)]
am
33b5dfb6: am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
33b5dfb684910c5dbcd0e58f24a90ead01078629':
Fix dx to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:07:35 +0000 (19:07 -0700)]
am
bfae1ee4: Merge "Fix dx.bat to match the new SDK structure." into jb-mr2-dev
* commit '
bfae1ee42bddedaf7ac7d77ce2f2fbd4486cf098':
Fix dx.bat to match the new SDK structure.
Xavier Ducrohet [Thu, 25 Apr 2013 02:07:33 +0000 (19:07 -0700)]
am
60db431f: am
4b724cff: Fix dx to match the new SDK structure.
* commit '
60db431fe44afb723654a19494b1ba0f35a735f0':
Fix dx to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:05:52 +0000 (19:05 -0700)]
am
909d94c0: am
c38a95aa: am
8f93edac: am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
909d94c03411be6ac6a6ef05934b2e01692be7ee':
Fix dx.bat to match the new SDK structure.
Xavier Ducrohet [Thu, 25 Apr 2013 02:05:34 +0000 (19:05 -0700)]
am
4b724cff: Fix dx to match the new SDK structure.
* commit '
4b724cff027771d0d905809605b5cc50df220a4a':
Fix dx to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:04:36 +0000 (02:04 +0000)]
Merge "Fix dx.bat to match the new SDK structure." into jb-mr2-dev
Raphael Moll [Thu, 25 Apr 2013 02:04:13 +0000 (19:04 -0700)]
am
c38a95aa: am
8f93edac: am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
c38a95aa2d595f39964587c93f823c75c339f208':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:03:12 +0000 (19:03 -0700)]
am
8f93edac: am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
8f93edacdb6270a48f98aa3a82733f0f912d333a':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 02:01:15 +0000 (19:01 -0700)]
am
2f23f4cb: am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
2f23f4cb813a810bb79f2ea09733b37c9af7639b':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Thu, 25 Apr 2013 01:59:15 +0000 (18:59 -0700)]
am
c26c1291: Fix dx.bat to match the new SDK structure.
* commit '
c26c1291743ce7877cf11f3dc73d6f0c240229f7':
Fix dx.bat to match the new SDK structure.
Raphael Moll [Wed, 24 Apr 2013 22:02:13 +0000 (15:02 -0700)]
Fix dx.bat to match the new SDK structure.
(Cherry-picked from
c26c1291743ce7877cf11f3dc73d6f0c240229f7)
Change-Id: I57a7678178fc58e2a101c9d86da5009c6ec4f6a0
Raphael Moll [Wed, 24 Apr 2013 22:02:13 +0000 (15:02 -0700)]
Fix dx.bat to match the new SDK structure.
(Cherry-pick from
c26c1291743ce7877cf11f3dc73d6f0c240229f7)
Change-Id: Ied431777e178529f1e2360bfbd69d2738839d5c6
Xavier Ducrohet [Tue, 26 Mar 2013 17:24:05 +0000 (10:24 -0700)]
Fix dx to match the new SDK structure.
(cherry picked from commit
cb9dfa123c6fcc43be629666837c4e6f86b476ea)
Change-Id: I071d73adc4a2eb812cdbc204d27884f4a527043d
Raphael Moll [Wed, 24 Apr 2013 22:02:13 +0000 (15:02 -0700)]
Fix dx.bat to match the new SDK structure.
Change-Id: I2c125bb40c7c64e010642274b482733c52b5c11e
Elliott Hughes [Tue, 23 Apr 2013 22:30:44 +0000 (15:30 -0700)]
am
886c776f: am
514eabb9: Remove spammy logging from
8470684 investigation.
* commit '
886c776fd9bb5938cbf214d7deddf9233a3a2f7e':
Remove spammy logging from
8470684 investigation.
Elliott Hughes [Tue, 23 Apr 2013 22:28:50 +0000 (15:28 -0700)]
am
514eabb9: Remove spammy logging from
8470684 investigation.
* commit '
514eabb960969b513c24f9cdfc8dec94c96d9359':
Remove spammy logging from
8470684 investigation.
Elliott Hughes [Tue, 23 Apr 2013 22:01:46 +0000 (15:01 -0700)]
am
121c1bd6: am
e5edfce1: Merge "Remove spammy logging from
8470684 investigation."
* commit '
121c1bd6fa32b812fa780c79efe30cbcc6f56793':
Remove spammy logging from
8470684 investigation.
Elliott Hughes [Tue, 23 Apr 2013 18:35:17 +0000 (11:35 -0700)]
Remove spammy logging from
8470684 investigation.
This has been tracked down to a kernel bug, so we no longer need
the extra diagnostics.
Bug:
8470684
(cherry picked from commit
3a9dbd30eb1598c737af7ef6110d46767d6e0336)
Change-Id: I0877a24a5a409695c3a1a9ddb5c7c4d78e6a578e
Elliott Hughes [Tue, 23 Apr 2013 18:54:32 +0000 (11:54 -0700)]
am
e5edfce1: Merge "Remove spammy logging from
8470684 investigation."
* commit '
e5edfce17359c0353744dd2b4db3a8deef2aef09':
Remove spammy logging from
8470684 investigation.
Elliott Hughes [Tue, 23 Apr 2013 18:44:41 +0000 (18:44 +0000)]
Merge "Remove spammy logging from
8470684 investigation."
Elliott Hughes [Tue, 23 Apr 2013 18:35:17 +0000 (11:35 -0700)]
Remove spammy logging from
8470684 investigation.
This has been tracked down to a kernel bug, so we no longer need
the extra diagnostics.
Bug:
8470684
Change-Id: Ib170d1f7b94488ed4acc763f8dddc44c81807aed