« Previous ea544ec Update JNI fillInetSocketAddress. by Piotr Jastrzebski · 9 years ago f4462f3 Fix CharsetDecoderICU / Use OpenJdk InputStreamReader. by Piotr Jastrzebski · 9 years ago eec452a Improve exception message for java.nio.Buffer. by Piotr Jastrzebski · 9 years ago af23b0c Fix a few networking related issues. by Piotr Jastrzebski · 9 years ago de626ec Use OpenJdk implementation of java.lang.* [part 3]. by Piotr Jastrzebski · 9 years ago ba7cc9f Rename FileDescriptor field. by Piotr Jastrzebski · 9 years ago 554120a Hide DefaultHostnameVerfier, rename variable. by Piotr Jastrzebski · 9 years ago 133892a Use OpenJdk implenentation of Charset{Encoder,Decoder}. by Piotr Jastrzebski · 9 years ago a80f9ae Use OpenJdk implementation of java.lang.* [part 2]. by Piotr Jastrzebski · 9 years ago 46e3649 Use OpenJdk implementation of java.lang.* [part 1] by Piotr Jastrzebski · 9 years ago 2e451d3 Suppress test that relies on implementation details. by Piotr Jastrzebski · 9 years ago f7ab2bc Use OpenJdk implementation of java.net.* by Piotr Jastrzebski · 9 years ago 8d05e88 Use OpenJdk implementations for java.io.* [part 2] by Piotr Jastrzebski · 9 years ago ad16291 Use OpenJdk implementation of java.lang.ref.*. by Piotr Jastrzebski · 9 years ago 9e0e11d Use OpenJdk implementation of java.lang.annotation.* by Piotr Jastrzebski · 9 years ago 05f3b63 Use OpenJdk implementation of java.lang.reflect.* by Piotr Jastrzebski · 9 years ago 648446e Use OpenJdk implementation of java.nio.* by Piotr Jastrzebski · 9 years ago dee594e Add machine-generated variants of Buffer classes. by Piotr Jastrzebski · 9 years ago 813d256 Add OpenJdk's ByteBuffer implementation. by Piotr Jastrzebski · 9 years ago 3d43823 Use OpenJdk implementation of java.nio.channels.{spi}.* by Piotr Jastrzebski · 9 years ago 7912679 Add OpenJdk implementations of java.nio.channels.* by Piotr Jastrzebski · 9 years ago d0b42d7 Fix ChannelsTest. by Piotr Jastrzebski · 9 years ago 9a9f76d Use OpenJdk Implementations of java.nio.charset.* by Piotr Jastrzebski · 9 years ago 1ae149a Use OpenJdk implementation of java.io.* by Piotr Jastrzebski · 9 years ago 983b2c6 Use OpenJdk implementation for java.util.* by Piotr Jastrzebski · 9 years ago adc4041 Fix unit tests from java.util.{zip, logging, prefs}.* by Piotr Jastrzebski · 9 years ago a8ed084 Use OpenJdk implementation of java.util.zip.* by Piotr Jastrzebski · 9 years ago 2683a45 Use OpenJdk implementation of java.util.prefs.* by Piotr Jastrzebski · 9 years ago 47f3c98 Use OpenJdk implementation of java.util.logging.* by Piotr Jastrzebski · 9 years ago 5c3c9df Set LOCAL_CORE_LIBRARY=true for core-all and core-oj. by Piotr Jastrzebski · 9 years ago 865b9d2 Use OpenJdk implementation of java.util.regex.* by Piotr Jastrzebski · 9 years ago b47f3e5 SSLSocketFactory: Tweak initialization sequence. by Piotr Jastrzebski · 9 years ago 875528b KeyAgreement / Mac : Change provider selection methods. by Piotr Jastrzebski · 9 years ago fa68edd Cipher: Throw early on getMaxAllowedKeyLength / getMaxAllowedParameterSpec by Piotr Jastrzebski · 9 years ago ad443e7 Signature: Check off, len & input early. by Piotr Jastrzebski · 9 years ago 330d61a Security: Increase version when we set a security property. by Piotr Jastrzebski · 9 years ago 4e46323 Identity: Fix removeCertificate by Piotr Jastrzebski · 9 years ago 1120db1 AlgorithmID: Attempt to parse mapping as an OID even if "OID." isn't specified. by Piotr Jastrzebski · 9 years ago fa8f068 SSLServerSocketFactory: Ignore exceptions from initializing default factory. by Piotr Jastrzebski · 9 years ago bd1eb2b Add sun.security.cert.internal.x509.X509V1CertImpl to core-oj. by Piotr Jastrzebski · 9 years ago d645860 AVA: Support hex-strings that have contain ' ' or an '\n' by Piotr Jastrzebski · 9 years ago b983219 Cipher: Try to instantiate provider even if supportsTransfer = S_YES by Piotr Jastrzebski · 9 years ago 56a5202 Add security resources to the list of files. by Piotr Jastrzebski · 9 years ago e6ace47 Fix X500PrincipalTest. by Piotr Jastrzebski · 9 years ago c85a2f9 Fix X500Name.countQuotes by Piotr Jastrzebski · 9 years ago 1c26ebc Fix AVA to not remove spaces. by Piotr Jastrzebski · 9 years ago f96e7e7 Fix X500PrincipalTest. by Piotr Jastrzebski · 9 years ago c0c7fab Fix X500PrincipalTest by Piotr Jastrzebski · 9 years ago c1236c4 Fix sort order of RDN. by Piotr Jastrzebski · 9 years ago 007d7ea Fix TrustAnchorTest. by Piotr Jastrzebski · 9 years ago a92140ae Fix X509CRLTest#testGetRevokedCertificate by Piotr Jastrzebski · 9 years ago c2597fc Fix Tests by Piotr Jastrzebski · 9 years ago 5d4394fd IdentityScope : make sure scope is assigned during init. by Piotr Jastrzebski · 9 years ago 296750b Fix X509CertSelectorTest. by Piotr Jastrzebski · 9 years ago 5e90575 Fix X509CertSelectorTest. by Piotr Jastrzebski · 9 years ago 1d958db Use OpenJdk implementation of parts of java.util.*, java.security.*. by Piotr Jastrzebski · 9 years ago 8b40ca9 Use OpenJdk implementation of javax.net, javax.net.ssl. by Piotr Jastrzebski · 9 years ago 9af8046 Use OpenJdk implementations of javax.crypto.* by Piotr Jastrzebski · 9 years ago 7339dc6 Use OpenJdk implementation of javax.sql.* by Piotr Jastrzebski · 9 years ago 3e57999 Use OpenJdk implementations of java.sql.*. by Piotr Jastrzebski · 9 years ago 595b4de Reimplement OpenJdk java.text.Collator (and friends).. by Piotr Jastrzebski · 9 years ago cbf78a3 Fix test expectations. by Piotr Jastrzebski · 9 years ago fc083f3 Track renamed test packages. by Piotr Jastrzebski · 9 years ago c46a2ea Add missing package names for legacy harmony tests. by Piotr Jastrzebski · 9 years ago 9e953b7 Fix package names for OsConstantsTest and SqlDateTest. by Piotr Jastrzebski · 9 years ago 9c853c5 Use OpenJdk implementations of java.text.* by Piotr Jastrzebski · 9 years ago 37cdafd Use OpenJdk implementations of java.beans.* by Piotr Jastrzebski · 9 years ago 51b1b69 Initial import of OpenJdk files. by Piotr Jastrzebski · 9 years ago 74b5e06 am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev by Daniel Xie · 9 years ago 7999eb2 am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev by Daniel Xie · 9 years ago f6a672c am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev by Daniel Xie · 9 years ago 904fb41 am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev by Daniel Xie · 9 years ago b266f2c am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev by Daniel Xie · 9 years ago 0e5d0c7 am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev by Daniel Xie · 9 years ago fd2df14 am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev by Daniel Xie · 9 years ago 9551a86 am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev by Daniel Xie · 9 years ago 917c8e0 am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev by Daniel Xie · 9 years ago 97a16d1 am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev by Daniel Xie · 9 years ago fe790a7 am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev by Daniel Xie · 9 years ago afc1b34 am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev by Daniel Xie · 9 years ago 779c726 Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev by Daniel Xie · 9 years ago 1d1abc5 Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev by Daniel Xie · 9 years ago fc71122 Fixes associated with the tzdata 2015a update by Neil Fuller · 10 years ago bb97fad Fix TimeZoneTest#testPreHistoricOffsets CTS failures. by Elliott Hughes · 10 years ago 6823274 am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev by dxie@google.com · 9 years ago c43d70e am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev by dxie@google.com · 9 years ago 9073d21 am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev by dxie@google.com · 9 years ago ba1b44d resolved conflicts for a18ebd19 to klp-modular-dev by cd /gitc/manifest-rw/klp-modular-dev-gitc-merge
repo sync
export OUT_DIR=/usr/local/google/gitc/klp-modular-dev-gitc-merge/out
# This should take 30 seconds to setup the full klp-modular-dev branch.
# To resolve the conflict, next we need to clone the repo project:
cd libcore
# Create a new, unique branch. Note this will clone the project and may take a while the first time, depending on the size of the repo project.
repo start manual_merge_a18ebd19 .
git fetch goog a18ebd194ea82c5190f86fe62b56f0e46b1b36cd
git merge a18ebd194ea82c5190f86fe62b56f0e46b1b36cd
# Fix the conflict (markers are in the file); Build & Test;
git add # (files you changed)
git commit -m "resolved conflicts for a18ebd19 to klp-modular-dev"
repo upload .
# get approval, submit · 9 years ago a18ebd1 am 66b3ce69: am 70a463cb: Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-c by Daniel Xie · 9 years ago 66b3ce6 am 70a463cb: Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev by Daniel Xie · 9 years ago 70a463c Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev by Daniel Xie · 9 years ago c5a96cf am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev by Daniel Xie · 9 years ago 141d6fe am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev by Daniel Xie · 9 years ago 3731a3c am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev by Neil Fuller · 9 years ago dc98ff6 am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 by Bill Yi · 9 years ago 3a8c0d1 am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev by Daniel Xie · 9 years ago 9b98f31 am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev by Daniel Xie · 9 years ago 05b8a1b am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() . Move Ethernet verification out of testLoopback()." into kitkat-cts-dev by Neil Fuller · 9 years ago 8970261 am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8 -s ours automerge: 8806a8e automerge: 81598a5 by Bill Yi · 9 years ago 392416f Fix the ENGINE_finish/ENGINE_free mixup by Takeshi Katae · 9 years ago Next »