summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-06-02package version metadata for external/Damien Miller
This will be used for automated notification of external vulnerability reports. Change-Id: I48ad137ac048f1dbbf281d9fc9522da85822d096
2015-03-31Merge "Remove copied reference to undefined local_javac_flags"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1master-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseColin Cross
2015-03-30Remove copied reference to undefined local_javac_flagsColin Cross
Change-Id: I55698002da69b576691193e266d5f56289025b3d
2015-01-23Merge "Stop building javasqlite on Mac OS"Narayan Kamath
2015-01-23Stop building javasqlite on Mac OSNarayan Kamath
We don't build core-libart-hostdex for mac os any longer. Change-Id: I613fcc0e823be71d9bf31889356270254b85bb0e
2014-12-16Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang
Bug: 18675947 Change-Id: Id9f1cfdbad715cfd9a5055aa2322bf25aefacd44
2014-06-19am b8501bde: Merge "Switch from core to core-libart"android-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseBrian Carlstrom
* commit 'b8501bdeb0b7e39a0d82f2a96ad382c05a763b22': Switch from core to core-libart
2014-06-18Merge "Switch from core to core-libart"android-l-preview_r2l-previewBrian Carlstrom
2014-06-18Switch from core to core-libartBrian Carlstrom
Bug: 14298175 Change-Id: Ic7310d02aa06529b82a168373e9402d7da46ddb1
2014-06-11am 6984b818: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
* commit '6984b8188bf3ea75d1edd5b6c1153580d8ff0a33': Remove deprecated WITH_HOST_DALVIK.
2014-06-10Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers
2014-06-08Remove deprecated WITH_HOST_DALVIK.Ian Rogers
Bug: 13751317 Change-Id: Ic10a54509331c943fd64f0f8f401488526661575
2013-11-26am 1bbcd337: Merge "Fix build rule for sqlite-jdbc-host."Narayan Kamath
* commit '1bbcd337ec8d51bea41e0d44df57a7e93c8af181': Fix build rule for sqlite-jdbc-host.
2013-11-26Merge "Fix build rule for sqlite-jdbc-host."idea133-weekly-releaseidea133Narayan Kamath
2013-11-26Fix build rule for sqlite-jdbc-host.Narayan Kamath
Two issues: - It was being used as a static library, so build it so. - It is meant for use by rules that run on host dalvik, so it should be compiled against libcore and not the host JRE. Change-Id: I6f1854fc531474ef2fe62f87f915a819be0ee32b
2013-11-07Tracking libnativehelper build changesBrian Carlstrom
(cherry picked from commit 62059eddf25ea783d3a6b341b8b300f11fe0c158) Change-Id: I3014a65bac1fad70a1d75ba7b2415582dc727871
2013-07-23remove JNIHelp.h from sqlite_jni.candroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devColin Cross
sqlite_jni.c doesn't need JNIHelp.h to compile, remove it to avoid having to pull in liblog to satisify the LOG?_EX definitions. Change-Id: Iadceea110c0c7e273518e140b898ee4f610a6c67
2012-12-04Merge "Simplify makefile."android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2tools_r22jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aospElliott Hughes
2012-12-04Simplify makefile.Elliott Hughes
Change-Id: I7a34acb8228522166602bdc0fe5bbfbbef545e02
2012-04-06Add NOTICE file.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-devjb-mr0-releasejb-devElliott Hughes
BSD-style license is obtained from http://www.ch-werner.de/javasqlite/overview-summary.html Bug: 6299628 Change-Id: I0971bcce516dbad93028b01f136a802910af21a3
2011-05-20Reconcile with honeycomb-releaseandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseThe Android Open Source Project
Change-Id: I894d810dbc4d37fe09a2f5e1ae8e9dd7dfbba152
2011-05-04no-op - reconcile with gingerbreadJean-Baptiste Queru
Change-Id: I0e34de93fa014863832a4d1e7165a1481109cacf
2011-04-01Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom
2011-03-18Move sqlite-jdbc to be a static libraryBrian Carlstrom
Change-Id: I1d0f6457720fc8946a5a5ae577400ab5b1ca29d7
2011-03-17am 546320f2: Moving sqlite-jdbc target from libcore/JavaLibrary.mkBrian Carlstrom
* commit '546320f2774fe8790871b986cf022fb01dfcb81a': Moving sqlite-jdbc target from libcore/JavaLibrary.mk
2011-03-17Moving sqlite-jdbc target from libcore/JavaLibrary.mkBrian Carlstrom
Change-Id: I44955819eec75328c085b22f8912f7738d827e27
2011-03-17Moving sqlite-jdbc target from libcore/JavaLibrary.mkBrian Carlstrom
Change-Id: I1d8cfaae4900a33f76b698f37028a8eb119b1dc9
2011-01-12am ead520c1: am c3c82545: am fe564e7e: Merge "Add a dex-containing jar file ↵Dan Bornstein
to the luni test resources." into honeycomb * commit 'ead520c16f641ba11f582f2b71c289a015e9b996': Add a dex-containing jar file to the luni test resources.
2011-01-12am a5bbd9d9: am 68095f6a: am 6ead9d74: am 6e35a860: Merge "Fix @see links" ↵Brad Fitzpatrick
into gingerbread * commit 'a5bbd9d9be7d2f234ab91ee82085a580e7055f5c':
2011-01-12Merge remote branch 'goog/dalvik-dev' into gingerbread-release-to-dalvik-devBrian Carlstrom
2011-01-12am c3c82545: am fe564e7e: Merge "Add a dex-containing jar file to the luni ↵Dan Bornstein
test resources." into honeycomb * commit 'c3c82545d27b71d88d2456a997250b77fc57ac99': Add a dex-containing jar file to the luni test resources.
2011-01-12am fe564e7e: Merge "Add a dex-containing jar file to the luni test ↵Dan Bornstein
resources." into honeycomb * commit 'fe564e7e61c70d784c800a8bb523a31e45a0366f': Add a dex-containing jar file to the luni test resources.
2011-01-12Merge "Add a dex-containing jar file to the luni test resources." into honeycombDan Bornstein
2011-01-12merge in honeycomb-release history after reset to honeycombThe Android Automerger
2011-01-12am 68095f6a: am 6ead9d74: am 6e35a860: Merge "Fix @see links" into gingerbreadBrad Fitzpatrick
* commit '68095f6a01a2e252413aac649d56cf6dc3c62409': Fix @see links
2011-01-12am 6ead9d74: am 6e35a860: Merge "Fix @see links" into gingerbreadBrad Fitzpatrick
* commit '6ead9d748abcf4e7a0b3359ffac24bad8168f284': Fix @see links
2011-01-11Merge commit '6e35a8607a94411fa1b9c92d2b5a5db40a49895b' into ↵Brian Carlstrom
gingerbread-release-to-dalvik-dev Conflicts: luni/src/main/java/java/lang/Class.java Change-Id: I0ff29f1697c5ff538f916f79ed65e2d22dde85a8
2011-01-11Merge "Change all "final static"s to "static final"." into dalvik-devElliott Hughes
2011-01-11am 320c81eb: Merge "Fix typo in testResponseCacheCallbackApis()."Jesse Wilson
* commit '320c81eb7448a1dc354e7567669060f6f8f077bf': Fix typo in testResponseCacheCallbackApis().
2011-01-11am a6b80b72: am 99d1e354: am 09c46404: Fix Document.getElementsByTagName to ↵Jesse Wilson
return the root node. * commit 'a6b80b7219c4d556b56e2de3bde28f276a45e6c9': Fix Document.getElementsByTagName to return the root node.
2011-01-11Merge "Fix typo in testResponseCacheCallbackApis()."Jesse Wilson
2011-01-11Change all "final static"s to "static final".Elliott Hughes
Just so we sound like native speakers. Change-Id: I4d98ec7519af8c1578609945ca9d480484b82874
2011-01-11am 99d1e354: am 09c46404: Fix Document.getElementsByTagName to return the ↵Jesse Wilson
root node. * commit '99d1e354bc4faaeac8a6de338c7e56964af030ea': Fix Document.getElementsByTagName to return the root node.
2011-01-11am 09c46404: Fix Document.getElementsByTagName to return the root node.Jesse Wilson
* commit '09c4640423dbe85c606c5b46312cd5c0e5c94eeb': Fix Document.getElementsByTagName to return the root node.
2011-01-11Fix typo in testResponseCacheCallbackApis().Jesse Wilson
Embarassing. Test passes with the typo fixed! Change-Id: Ic348f68c0e720163ca77b125415b01e840c7412d
2011-01-11Fix Document.getElementsByTagName to return the root node.Jesse Wilson
I introduced this regression when changing Element.getElementsByTagName to not return itself. Note that one of our tests (GetElementsByTagNameNS) had the wrong expectation here; the new result is consistent with the RI. Also fix a related problem in InnerNodeImpl which assumes the document field is always non-null. It can be null for Doctype nodes! Change-Id: I40b5bb52b8396cd282cd5465029a9f0c4040de0c
2011-01-11am b7ccc2d0: Merge "Expand predefined entities by default, even if ↵Jesse Wilson
coalescing is off." * commit 'b7ccc2d092e8a500f8d646a9ea0c535a1d440956': Expand predefined entities by default, even if coalescing is off.
2011-01-11Merge "Expand predefined entities by default, even if coalescing is off."Jesse Wilson
2011-01-11Add a dex-containing jar file to the luni test resources.Dan Bornstein
This is meant to be used in the class loading tests. This change doesn't include any such tests, but they'll be coming soon! Change-Id: Ic02a9d0faa572745d1485d6b5c83e70303b31abb
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:42:05 +0000