HomeSort by relevance Sort by last modified time
    Searched refs:merge (Results 1 - 25 of 318) sorted by null

1 2 3 4 5 6 7 8 91011>>

  /dalvik/dx/src/com/android/dx/merge/
CollisionPolicy.java 17 package com.android.dx.merge;
  /external/emma/core/java12/com/vladium/emma/data/
IMergeable.java 27 IMergeable merge (IMergeable data); method in interface:IMergeable
  /external/clang/
README.android 9 * merge conflicts with upstream on those parts.
11 * The file contains useful hints when we try to resolve future 3-way merge
23 * Recent downstreaming on 2012/4/24: Synced to r155088 (sliao for merge questions)
24 * Recent downstreaming on 2012/3/24: Synced to r153220 (sliao & srhines for merge questions)
25 * Recent downstreaming on 2012/3/5: Synced to r152062 (srhines & sliao for merge questions)
26 * Recent downstreaming on 2011/12/17: Synced to r146715 (loganchien & sliao for merge questions)
27 * Recent downstreaming on 2011/11/26: Synced to r145117 (loganchien & sliao for merge questions)
28 * Recent downstreaming on 2011/11/17: Synced to r144605 (loganchien & sliao for merge questions)
29 * Recent downstreaming on 2011/11/14: Synced to r144355 (srhines for merge questions)
30 * Recent downstreaming on 2011/10/22: Synced to r142531 (sliao & loganchien for merge questions
    [all...]
  /dalvik/dexgen/src/com/android/dexgen/util/
IntSet.java 50 * @param other {@code non-null;} other set to merge with.
52 void merge(IntSet other); method in interface:IntSet
  /dalvik/dx/src/com/android/dx/util/
IntSet.java 50 * @param other {@code non-null;} other set to merge with.
52 void merge(IntSet other); method in interface:IntSet
  /external/dexmaker/src/dx/java/com/android/dx/util/
IntSet.java 50 * @param other {@code non-null;} other set to merge with.
52 void merge(IntSet other); method in interface:IntSet
  /dalvik/dx/tests/119-merge-conflict/com/android/dx/merge/
MergeConflictTest.java 17 package com.android.dx.merge;
31 DexBuffer ab = new DexMerger(a, b, CollisionPolicy.FAIL).merge();
36 dexMerger.merge();
  /external/emma/core/java12/com/vladium/emma/rt/
RTCoverageDataPersister.java 38 final File outFile, final boolean merge)
54 DataFactory.persist (cdataView, outFile, merge);
61 log.info ("runtime coverage data " + (merge ? "merged into" : "written to") + " [" + outFile.getAbsolutePath () + "] {in " + (end - start) + " ms}");
  /external/llvm/
README.android 9 * merge conflicts with upstream on those parts.
11 * The file contains useful hints when we try to resolve future 3-way merge
23 * Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/llvm/trunk@157317 (Contact srhines for merge questions.)
24 * Recent downstreaming on 2012/4/24: Synced to r155090 (Contact sliao for merge questions.)
25 * Recent downstreaming on 2012/3/24: Synced to r153224 (Contact sliao & srhines for merge questions.)
26 * Recent downstreaming on 2012/3/5: Synced to r152063 (Contact srhines & sliao for merge questions.)
27 * Recent downstreaming on 2011/12/17: Synced to r146714 (Contact loganchien & sliao for merge questions.)
28 * Recent downstreaming on 2011/11/26: Synced to r145126 (Contact loganchien & sliao for merge questions.)
29 * Recent downstreaming on 2011/11/17: Synced to r144606 (Contact loganchien & sliao for merge questions.)
30 * Recent downstreaming on 2011/11/14: Synced to r144354 (Contact srhines for merge questions.
    [all...]
  /sdk/emulator/opengl/host/libs/Translator/GLcommon/
GLESbuffer.cpp 42 m_conversionManager.merge();
48 rOut.merge();
  /dalvik/dx/tests/119-merge-conflict/
run 23 dx --dex --output=test.jar com/android/dx/merge/* $dxjar
25 # Build a resource .jar containing the .dex files to merge
31 junit.textui.TestRunner com.android.dx.merge.MergeConflictTest > unit-out.txt
  /dalvik/dx/tests/115-merge/
run 23 dx --dex --output=test.jar com/android/dx/merge/* $dxjar
25 # Build a resource .jar containing the .dex files to merge
34 junit.textui.TestRunner com.android.dx.merge.DexMergeTest > unit-out.txt
  /external/chromium/net/base/
upload_data_stream.h 70 static void set_merge_chunks(bool merge) { merge_chunks_ = merge; }
  /external/compiler-rt/
README.android 9 * merge conflicts with upstream on those parts.
11 * The file contains useful hints when we try to resolve future 3-way merge
17 * Cherry-pick on 2012/05/23: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157318 for ASan (Contact srhines for merge questions.)
18 * Recent downstreaming on 2012/03/08: Synced to r152058 (Contact srhines for merge questions.)
  /external/llvm/utils/release/
merge.sh 2 #===-- merge.sh - Test the LLVM release candidates -------------------------===#
11 # Merge a revision into a project.
22 echo " -proj PROJECT The project to merge the result into"
23 echo " -rev NUM The revision to merge into the project"
61 tempfile=`mktemp /tmp/merge.XXXXXX` || exit 1
70 svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
  /external/nist-sip/java/gov/nist/core/
HostPort.java 150 public void merge(Object mergeObject) { method in class:HostPort
151 super.merge (mergeObject);
  /frameworks/base/libs/hwui/utils/
SortedListImpl.h 36 ssize_t merge(const VectorImpl& vector);
37 ssize_t merge(const SortedListImpl& vector);
SortedListImpl.cpp 84 ssize_t SortedListImpl::merge(const VectorImpl& vector) { function in class:android::uirenderer::SortedListImpl
85 // naive merge...
100 ssize_t SortedListImpl::merge(const SortedListImpl& vector) { function in class:android::uirenderer::SortedListImpl
111 err = merge(static_cast<const VectorImpl&> (vector));
  /dalvik/vm/alloc/
DdmHeap.cpp 182 bool merge; member in struct:HeapChunkContext
280 //TODO: if ctx.merge, see if this chunk is different from the last chunk.
358 static void walkHeap(bool merge, bool native)
369 ctx.merge = merge;
373 if (ctx.merge) {
399 bool merge; local
424 merge = true;
426 merge = false;
440 walkHeap(merge, native)
    [all...]
  /external/protobuf/java/src/test/java/com/google/protobuf/
TextFormatTest.java 284 TextFormat.merge(allFieldsSetText, builder);
290 TextFormat.merge(new StringReader(allFieldsSetText), builder);
296 TextFormat.merge(allExtensionsSetText,
328 TextFormat.merge(original, builder);
334 TextFormat.merge(exoticText, builder);
347 TextFormat.merge(messageSetText, extensionRegistry, builder);
362 TextFormat.merge("optional_nested_enum: 2", builder);
368 TextFormat.merge("OptionalGroup: < a: 1 >", builder);
375 TextFormat.merge(
387 TextFormat.merge(text, TestUtil.getExtensionRegistry(), builder)
    [all...]
  /external/stlport/test/unit/
merge_test.cpp 41 merge((int*)numbers1, (int*)numbers1 + 5, (int*)numbers2, (int*)numbers2 + 5, (int*)result);
62 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin());
85 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin(), greater<int>() );
  /ndk/tests/device/test-gnustl-full/unit/
merge_test.cpp 41 merge((int*)numbers1, (int*)numbers1 + 5, (int*)numbers2, (int*)numbers2 + 5, (int*)result);
62 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin());
85 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin(), greater<int>() );
  /ndk/tests/device/test-stlport/unit/
merge_test.cpp 41 merge((int*)numbers1, (int*)numbers1 + 5, (int*)numbers2, (int*)numbers2 + 5, (int*)result);
62 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin());
85 merge(v1.begin(), v1.end(), v2.begin(), v2.end(), result.begin(), greater<int>() );
  /dalvik/dx/src/com/android/dx/cf/code/
OneLocalsArray.java 191 public LocalsArray merge(LocalsArray other) { method in class:OneLocalsArray
193 return merge((OneLocalsArray)other);
195 // LocalsArraySet knows how to merge me.
196 return other.merge(this);
202 * instance. A more-refined version of {@link #merge(LocalsArray) merge}
205 * @param other locals array with which to merge
206 * @return this instance if merge was a no-op, or a new instance if
207 * the merge resulted in a change.
209 public OneLocalsArray merge(OneLocalsArray other) method in class:OneLocalsArray
    [all...]