summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-19Merge "Fix compatibility with Robolectric." am: 8845f3212eBrett Chabot
am: 5255f14314 Change-Id: I696126dcfb4a9d0315c70f8f5dc3f1a1bbb7d66e
2018-10-19Merge "Fix compatibility with Robolectric."Brett Chabot
am: 8845f3212e Change-Id: I655d3a92182496448ef1a119859b213dfa940eec
2018-10-19Merge "Fix compatibility with Robolectric."Treehugger Robot
2018-10-18Fix compatibility with Robolectric.Brett Chabot
Robolectric at somepoint changed to return a valid Java ClassLoader from Context.getClassLoader(), breaking the check in MultiDex. Modify this check to ensure a valid Dex compatible classloader. Test: Added integration tests in Robolectric; m -j checkbuild Change-Id: I9df517e25460daa5fabfe8cba88cdc5d9bb16de2
2018-08-08Merge Android Pie into master am: eb24b3049f am: e3c17ce4b0 am: c358e4589fXin Li
am: cf68d9fb3a Change-Id: Iad7eb8bc32693a30116ad590d720dd01b2aa52fb
2018-08-07Merge Android Pie into master am: eb24b3049f am: e3c17ce4b0Xin Li
am: c358e4589f Change-Id: Ibfcb54e45db345099ca1a36d691a23d5ced8371a
2018-08-07Merge Android Pie into master am: eb24b3049fXin Li
am: e3c17ce4b0 Change-Id: If3a793437f4fe2c3bedfcf176dfca4d0fecbb463
2018-08-07Merge Android Pie into masterXin Li
am: eb24b3049f Change-Id: Ifa298fc125b0f0dad39381c920fd23b3e847ce5b
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
Bug: 112104996 Change-Id: Iedd4a8fe7ef0233a4395c8c269b80b52b6a97acd
2018-08-01Merge "Fix ub-multidex gradle build, add docs"Alan Viverette
2018-07-24Merge "Update OWNERS in frameworks/multidex." am: 0572c7e8a9 am: 0a66748ecf ↵Mads Ager
am: 69004499aa am: b189073fe9 Change-Id: I77b91eac391b8d390b23f8e8862e2191216e8208
2018-07-24Merge "Update OWNERS in frameworks/multidex." am: 0572c7e8a9 am: 0a66748ecfMads Ager
am: 69004499aa Change-Id: I3a8cea8c2f0d06197f7f41f253f7f0abe3f61c35
2018-07-24Merge "Update OWNERS in frameworks/multidex." am: 0572c7e8a9Mads Ager
am: 0a66748ecf Change-Id: I2218fe1ecd4642da5474bec6b99e2c293abc362a
2018-07-24Merge "Update OWNERS in frameworks/multidex."temp_p_mergeMads Ager
am: 0572c7e8a9 Change-Id: I28cace033c1ce6b0fd06b16ed1ab439dffc1fa8f
2018-07-24Merge "Update OWNERS in frameworks/multidex."android-n-iot-release-smart-display-r2Treehugger Robot
2018-07-23Fix the broken build: git_master/apps am: edc9c8d3e1 am: f087e881a1 am: ↵Nan Zhang
8bccbfb84a am: 9b17f9b336 Change-Id: I9ceef83b50f83a27c9631bde15da42c415766b11
2018-07-23Fix the broken build: git_master/apps am: edc9c8d3e1 am: f087e881a1Nan Zhang
am: 8bccbfb84a Change-Id: If719e66e4c58352612800532d975adb16814a16b
2018-07-23Fix the broken build: git_master/apps am: edc9c8d3e1Nan Zhang
am: f087e881a1 Change-Id: I2ac5a8fd5b7b7fc8a1d8dfb090cff0d4230b21d1
2018-07-23Fix the broken build: git_master/appsNan Zhang
am: edc9c8d3e1 Change-Id: Id8bc64c0537bae7915cb416963ea695484cd4859
2018-07-23Fix the broken build: git_master/appsNan Zhang
Orignally the Make version doesn't build them for unbundled branches. So turn off the build for these targets in Android.bp. Test: N/A Bug: b/70351683 Change-Id: Ia8924ad258254f7b23edfb792a11e4af7b6089ce
2018-07-23Convert android-support-multidex-(instrumentation) to Soong am: 2121bfabfe ↵Nan Zhang
am: 711913cd28 am: 412ca9b104 am: 84f19b4a02 Change-Id: I4c079143bfbbee6ecab9aad1112ad853c0110313
2018-07-23Convert android-support-multidex-(instrumentation) to Soong am: 2121bfabfe ↵Nan Zhang
am: 711913cd28 am: 412ca9b104 Change-Id: I2acac147d994ddefc33ec62155c33b4fc72c76ad
2018-07-23Convert android-support-multidex-(instrumentation) to Soong am: 2121bfabfeNan Zhang
am: 711913cd28 Change-Id: I59a842cfe1b37c9044224caf25c0a28ea21863af
2018-07-23Convert android-support-multidex-(instrumentation) to SoongNan Zhang
am: 2121bfabfe Change-Id: I86adfaf656a3cc050b7ff688efe36ee95c998b28
2018-07-23Update OWNERS in frameworks/multidex.Mads Ager
Four out of five have left Google and Andrew hasn't worked on this for a while. Change-Id: If291afda77aeab66bd7f625cd2a84fb5349a3ba0
2018-07-20Fix ub-multidex gradle build, add docsAlan Viverette
Bug: 63945424 Test: ./gradlew dist Change-Id: Ib2e7ab6a02aa8944a1ebd4ac20636c90c95543ab
2018-07-13Convert android-support-multidex-(instrumentation) to SoongNan Zhang
Bug: b/70351683 Test: m -j offline-sdk-docs Change-Id: I59951b48511c55285a5123d2fc397f9a5a8b2d8b
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: a4c2eaf8bcXin Li
am: 021ed7dcf9 Change-Id: I39248e50ed3682c43f31c9883aa88b428180e8d3
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: a4c2eaf8bc Change-Id: I3d7305b974dd99051556d89fac923a943e83c690
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: I6d4692893cd335d7d5089764977adfe18e054431
2018-05-02multidex: Update path to android.jar. am: 232a4df4d5 am: 20a0918419Anton Hansson
am: 393d403f9a Change-Id: I2cd5b9a2f15ff8bd1a6767059de65e7b25493835
2018-05-02multidex: Update path to android.jar. am: 232a4df4d5Anton Hansson
am: 20a0918419 Change-Id: Idb839d34e0c5fecfb6573bf53741df16327f5285
2018-05-02multidex: Update path to android.jar.Anton Hansson
am: 232a4df4d5 Change-Id: I39536c71692d8a5d660e3715fa2232585f46f209
2018-05-01multidex: Update path to android.jar.android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1Anton Hansson
This file has been copied to a new location. Update the multidex gradle build to refer the new location so that the old one can be deleted. Test: No Bug: 77525052 Change-Id: Ic7a1c19be543a06d01ad0b48b909c4e116327e5e
2018-03-13Snap for 4651078 from 475db106115d4f25f0e41612a2a71a0cfe83ab38 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Id57ae972986129904bf3712e025ca3098795ab16
2018-03-13Migrate multidex to androidx am: 475db10611Alan Viverette
am: b720bf6e02 Change-Id: Ibf3d276f2fdda6f39949572236a961fa5d6a8c87
2018-03-13Migrate multidex to androidxAlan Viverette
am: 475db10611 Change-Id: I24cc47dfbd38bacc3dc21993fbee9505d3797471
2018-03-09Migrate multidex to androidxandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devAlan Viverette
Bug: 74397601 Test: make Change-Id: Iddea6f92cc7796125cf4d1ba86cf9b7425daef72
2018-02-06Snap for 4587185 from eb8d5626ff8b7781e3a2ec6c3990785697adb99f to pi-releaseandroid-build-team Robot
Change-Id: I201b8ed8a9c3c7404883a3c3a05d9039d0ef5bad
2018-02-05Fix installation on some JB am: 38be0f4882 am: 84362fa835Yohann Roussel
am: f954060c0d Change-Id: Ibb4d500616caa5e6c1f4a88caa78726d896f2b3e
2018-02-05Fix installation on some JB am: 38be0f4882Yohann Roussel
am: 84362fa835 Change-Id: Ief08de3010d7620b79010297c93bab5325f9e7cd
2018-02-05Fix installation on some JBYohann Roussel
am: 38be0f4882 Change-Id: I7c07eb5df16dec854274a74fc61ecf8f546b7113
2018-02-01Fix installation on some JBandroid-p-preview-1android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Yohann Roussel
DexPathList had a few changes accross Jelly Bean versions: - dexElements was renamed pathElements and then renamed back to dexElements. - Element constructor was changed twice. Test: MultiDex tests several differents 4.x Android emulators and devices. Bug: 71989458 Change-Id: I242937a9f444d53cf6dd5b15d7933d0a9b51e162
2018-01-29merge in pi-release history after reset to mastergitbuildkicker
2018-01-29merge in pi-release history after reset to mastergitbuildkicker
2018-01-28Snap for 4571561 from ef4a94d96ba9e3cf8d26d029bb19209fd2b54cd6 to pi-releaseandroid-build-team Robot
Change-Id: I148f7d41d2ae3b3cfeb70c10d0fd535dacbe02c6
2018-01-26Tag library jar with git version am: 67bac2efbb am: 37f401f641Yohann Roussel
am: 2304fcd141 Change-Id: I7c4bca0c17162825c5ea6a9fdf158c2a31ffd2cb
2018-01-26Fix gradle build: set source level to Java 7 am: 78dfa21606 am: 3baa0bfebfYohann Roussel
am: 66b29ae511 Change-Id: I1df4ad98ba32dea7c5a0473226cacdf6926d8bfa
2018-01-26Tag library jar with git version am: 67bac2efbbYohann Roussel
am: 37f401f641 Change-Id: I4f3a17f5969a8e04a8d3ec07bc27723bed02301e
2018-01-26Fix gradle build: set source level to Java 7 am: 78dfa21606Yohann Roussel
am: 3baa0bfebf Change-Id: Ie922eb8fdd69ec3bef767f139571e91511590a14
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 17:48:58 +0000