summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: Ia823681c5104d6b1986330db6205eebb5af3f307
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: a7af9ae1f1 Change-Id: I13426d0d59e99d01f8396938f09f047fdb0b15b2
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I32794cff1264db70768464f8c9dc49422c99ea9a
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ifbae4d323a754181851a4eaa0313dcd45c8bfa19
2019-01-29Remove empty Android.mk file am: ab3fe997f4 am: 615d329223Sasha Smundak
am: 996322043e Change-Id: Ia52836d975d4710db6ab5506c87366dcfe644ab4
2019-01-28Remove empty Android.mk file am: ab3fe997f4Sasha Smundak
am: 615d329223 Change-Id: I69cb9d65a40fc6dbd832733e6783d2f961742ff8
2019-01-28Remove empty Android.mk fileSasha Smundak
am: ab3fe997f4 Change-Id: I538712ece44ec6f1477dd090c5b787f8eeef41ec
2019-01-25Remove empty Android.mk fileandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseSasha Smundak
See build/soong/README.md for more information. Change-Id: I13370970474c8398e8e2facd7c9e6e4a84211d0f Fixes: 122332710 Test: treehugger
2018-11-27Do not use regexps to parse simple version strings. am: 44d3900a5d am: ↵Mads Ager
1d9ec348fa am: ee97c923a8 Change-Id: I5886cb785caff9021a59f207f749d9c5bb206375
2018-11-27Do not use regexps to parse simple version strings. am: 44d3900a5dMads Ager
am: 1d9ec348fa Change-Id: I5d6c3a420887c5cd4653ac0c8fd9bebdaef1bea8
2018-11-27Do not use regexps to parse simple version strings.Mads Ager
am: 44d3900a5d Change-Id: I48e9b1b17285d760d7ae57228d3bb4fd680ed7a3
2018-11-27Do not use regexps to parse simple version strings.android-wear-8.0.0_r2android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseMads Ager
This saves 5-10ms on a JellyBean Samsung Nexus S for the check to see whether the VM supports multidex natively. On a newer Samsung S7 phone it saves 0.5 ms. Test: manually tested on old and new devices. Bug: 74259172 Change-Id: Ic05645deb5b4b990d07c726aa0fdd5f0cfa5884b
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9c7e15dfb8 -s ours am: dc54499a84 -s ours am: e56892fef3 -s ours Change-Id: I2515494cb905bc257c09d7e796eb358384a0f435
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9c7e15dfb8 -s ours am: dc54499a84 -s ours Change-Id: Ife8e6ca7b61d14166ca18195513e23bc75edec7c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 9c7e15dfb8 -s ours Change-Id: I27260eae384f7b2547f66a070a33ff206572a3cd
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsBill Yi
Change-Id: Ida4dda1d324b0a1b2268dbb64632f15e5bf6f3fc
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 4c24c2a390 -s ours am: e702bff674 -s ours Change-Id: I9632fff744a8a226304f0e195464811718cd5977
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 4c24c2a390 -s ours Change-Id: I886fd8255f8d14f24628abe8b259ced4f816079a
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I4199b6ed5886b0255d37fdb3408b34c953280def
2018-10-19Merge "Fix compatibility with Robolectric." am: 8845f3212e am: 5255f14314Brett Chabot
am: 15bbdce417 Change-Id: I73c74d4005470087040a49c9ec1b20e48041b32c
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 15:59:48 +0000