summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-25[automerger skipped] Convert Android.mk file to Android.bp am: 75b90f4631 ↵android-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-releaseSasha Smundak
am: 8eb596b34f am: 4695abb0d2 -s ours am skip reason: change_id Iabca84a02451ac57774e4e7263f9de5ff0e38c4e with SHA1 345d2b8e06 is in history Change-Id: Ib918bb03ec8601c8ddffc384a5dcd93c6e4eb822
2019-02-25Convert Android.mk file to Android.bp am: 75b90f4631Sasha Smundak
am: 8eb596b34f Change-Id: Ie8b5d7a22ef05cd8b3057e89113619fdbfd11627
2019-02-25[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into ↵Xin Li
stage-aosp-master am: 9306013845 -s ours am: 002697e425 -s ours am skip reason: subject contains skip directive Change-Id: I4592efaa7435d752fc018f2580d9cd8eaf469f4c
2019-02-25[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: 9306013845 -s ours am skip reason: subject contains skip directive Change-Id: If470556564b139aaad08bdc2bce2304f82c90b64
2019-02-21Convert Android.mk file to Android.bpSasha Smundak
am: 75b90f4631 Change-Id: I63826a4ae172af86c32180e9fdacc2e5aaff9435
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I00ca3266c98b31ba1e56db09a8cffc952b0223d9
2019-02-20Convert Android.mk file to Android.bpandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Sasha Smundak
See build/soong/README.md for more information. Fixes: 122331932 Test: treehugger Change-Id: Iab00f22da9e813d14ced471878d8e3a35024eb38 Merged-In: Iabca84a02451ac57774e4e7263f9de5ff0e38c4e
2019-02-14Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Bug: 122331932 Test: treehugger Change-Id: Iabca84a02451ac57774e4e7263f9de5ff0e38c4e
2019-02-14[automerger skipped] Remove unnecessary dependency on legacy-android-test ↵Paul Duffin
am: db3ac3ba63 am: bb3298aaad am: 257a8a6b6b -s ours am skip reason: change_id I967af72c40498057b8c8865f4493065842e51df4 with SHA1 5be7f5c623 is in history Change-Id: Ib79b7f535d5b2287670e8bf1e6e785649bd9767c
2019-02-14Remove unnecessary dependency on legacy-android-test am: db3ac3ba63Paul Duffin
am: bb3298aaad Change-Id: Idec45916244be9482b720ff9a24cbe68528ee343
2019-02-14Remove unnecessary dependency on legacy-android-testPaul Duffin
am: db3ac3ba63 Change-Id: Id8c56a6771c3aca178e5be90a37d385308438fad
2019-02-14Remove unnecessary dependency on legacy-android-testPaul Duffin
The compile time dependencies needed by PresencePollingTests are provided by the android.test.runner and android.test.base targets and the runtime dependencies are provided by the android.test.base which is on the bootclasspath and the android.test.runner library specified in the AndroidManifest.xml. Bug: 63127064 Test: make checkbuild and checked manifest manually Change-Id: Ibfbe4b4afb895b71176619f95f2a241984c7f232 Merged-In: I967af72c40498057b8c8865f4493065842e51df4
2019-02-14Merge "Remove unnecessary dependency on legacy-android-test"Paul Duffin
2019-02-13Add back LOCAL_COMPATIBILITY_SUITE from PresencePolling am: 758ecca7ef am: ↵yangbill
8975c6a8c8 am: 20cdfe2af1 Change-Id: Id62445dfce45521853a9ca7ea6dbb4b86d6e1ca3
2019-02-13Add back LOCAL_COMPATIBILITY_SUITE from PresencePolling am: 758ecca7efyangbill
am: 8975c6a8c8 Change-Id: I53f6f5b4f44d44144446c541b7b1af59b740209b
2019-02-13Add back LOCAL_COMPATIBILITY_SUITE from PresencePollingyangbill
am: 758ecca7ef Change-Id: I558616b8103f4dea86eab99ca55a7e036e7ab913
2019-02-13Remove unnecessary dependency on legacy-android-testPaul Duffin
The compile time dependencies needed by PresencePollingTests are provided by the android.test.runner and android.test.base targets and the runtime dependencies are provided by the android.test.base which is on the bootclasspath and the android.test.runner library specified in the AndroidManifest.xml. (cherry picked from commit 4638da291efd8bfa5d3b8bee9d72bb9d4225d328) Bug: 63127064 Test: make checkbuild and checked manifest manually Change-Id: I967af72c40498057b8c8865f4493065842e51df4
2019-02-12Add back LOCAL_COMPATIBILITY_SUITE from PresencePollingyangbill
PresencePolling.apk is still needed for PresencePollingTests. Here's the test config: https://android.googlesource.com/platform/external/ims/+/master/rcs/presencepolling/tests/AndroidTest.xml#22 Add LOCAL_COMPATIBILITY_SUITE setting back but force set this module's install path to $(TARGET_OUT_APPS) for later CL's preparation of test dependency build process modification. Bug: 124274486 Test: m PresencePolling m device-tests Change-Id: I31338265d387c3f2cfc879c99ecadca93eee8f60
2019-01-20Remove LOCAL_COMPATIBILITY_SUITE from PresencePolling am: ec9d5d186b am: ↵nelsonli
95c61be86c am: 9182773df7 Change-Id: Ia2bba0a5575129941c952a0d7d335293116c6206
2019-01-20Remove LOCAL_COMPATIBILITY_SUITE from PresencePolling am: ec9d5d186bnelsonli
am: 95c61be86c Change-Id: Ide150dce2c30abd6708d3eed32bcd32a8a659a83
2019-01-20Remove LOCAL_COMPATIBILITY_SUITE from PresencePollingnelsonli
am: ec9d5d186b Change-Id: Ifab1cafacb8738b384047431f62a74ca67b4301a
2019-01-18Remove LOCAL_COMPATIBILITY_SUITE from PresencePollingnelsonli
Move the default install path from $(my_prefix)OUT_DATA to $(my_prefix)OUT_TESTCASES for test modules. But some modules will build break because of this change, so we should fix them first. It will met below build break: FAILED: build/make/core/main.mk:1100: warning: build/make/target/product/mainline_system.mk produces files outside its artifact path requirement. Offending entries: testcases/PresencePolling/arm64/PresencePolling.apk This module should not define it as LOCAL_COMPATIBILITY_SUITE Bug: 117224272 Test: make PresencePolling Change-Id: Ifc2942d43816a50cc13fe9f851f30644feb96927
2018-12-13Migrate external/ims to androidx.testBrett Chabot
See go/jetpack-test-android-migration Test: make checkbuild Change-Id: Ib83bee14185f58726799061328590a7e3f75b27d
2018-12-07Merge "Do not start init until ACTION_UCE_SERVICE_UP" am: 103cd11ce0 am: ↵Brad Ebinger
45d0bf3f1e am: 3b17c9d761 Change-Id: Iaff7c3f1a7cb6608fb851c14cadc019517d5252f
2018-12-07Merge "Do not start init until ACTION_UCE_SERVICE_UP" am: 103cd11ce0Brad Ebinger
am: 45d0bf3f1e Change-Id: Id832b79d75e65c19bb985c33799405083b889939
2018-12-07Merge "Do not start init until ACTION_UCE_SERVICE_UP"Brad Ebinger
am: 103cd11ce0 Change-Id: I77648fbf42b7952df6662f0a069fb180c4819414
2018-12-07Merge "Do not start init until ACTION_UCE_SERVICE_UP"Treehugger Robot
2018-12-06[automerger skipped] DO NOT MERGE am: 687cb412fe -s ours am: e8d6da66ab -s ↵The Android Open Source Project
ours am: 5856368459 -s ours Change-Id: I18eb80e80834cbd94326a9f45d057333fb17c621
2018-12-06[automerger skipped] DO NOT MERGE am: 687cb412fe -s oursThe Android Open Source Project
am: e8d6da66ab -s ours Change-Id: Ie492575837badba61f167913a64daa5c958c48e3
2018-12-06[automerger skipped] DO NOT MERGEThe Android Open Source Project
am: 687cb412fe -s ours Change-Id: I8c715b46d4c2fd95097eed81aa138868e3f67632
2018-12-06DO NOT MERGEThe Android Open Source Project
Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: I56a8bc29a738f8bf0834b06ee6fc6bad330f6568
2018-11-28Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releasepie-platform-releasepie-cuttlefish-testingBill Yi
Change-Id: I04b66f3e9390c438a6d6c404b16adfd607f0fc53
2018-11-27Do not start init until ACTION_UCE_SERVICE_UPBrad Ebinger
We were trying to get the UCE service before it was sending the correct intent, which would sometimes cause it to lock up (in certain race conditions). Remove init when starting RCS service as well as when IMS is connected. The UCE_SERVICE_UP intent is sticky, so there is no problem restarting the RcsService if it crashes. Bug: 119309891 Test: Manual Change-Id: I39eeb5ca497408893b8a3e4e5b5644cfcecadf35
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 49fd6b2abe -s ours am: c2b37295df -s ours am: 41e79d067a -s ours Change-Id: Icb890d8bcd2b7f24c42c6552b97718fdf99db6b4
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 49fd6b2abe -s ours am: c2b37295df -s ours Change-Id: Ida10a3126c01acc83f4d308c9ab63abb2f330430
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 49fd6b2abe -s ours Change-Id: I4ac77bce20c0afc07b87d2cedf5c56cb854fdb34
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2Bill Yi
Change-Id: I89f81e6ac4554dd7bf515685570af76ed9bdceb9
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: b5fd718983 -s ours am: fe93424de5 -s ours Change-Id: Ie1f6dcf4a9781cd30f3ca68153c19b007933d988
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: b5fd718983 -s ours Change-Id: I92c978a47d65c7f4b948d9baa942be588a3c5b03
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I556b7424d4a229f2006a6b839d64c7ef7542c866
2018-10-19Merge pi-dr1-dev to aosp-master am: fd1da08026 am: f760de2402Bill Yi
am: ee19f10fd9 Change-Id: I3e193333362e9e34ae409903412789f05a70f4d4
2018-10-19Merge pi-dr1-dev to aosp-master am: fd1da08026Bill Yi
am: f760de2402 Change-Id: Iba699a333b77e49050caff3fb02f5db05b49bcf4
2018-10-19Merge pi-dr1-dev to aosp-masterBill Yi
am: fd1da08026 Change-Id: I203ecea9bd9338e51d196e922752c97e2a3c3f95
2018-10-19Merge pi-dr1-dev to aosp-masterBill Yi
Change-Id: I17916816e701feb26dcfa36fed3474f174cbedbf
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-master am: d329e81524Xin Li
am: 959811237b Change-Id: If50ae9b798c1fd3c5ea192a278561ce3bebd0611
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
am: d329e81524 Change-Id: I32e79a396267c4744b512cffb36d712287ee8b1a
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterpie-tempXin Li
Bug: 112535855 Change-Id: Id30744188724e812c81a75c52b429d3a6d831452
2018-08-08Merge Android Pie into master am: d739e134e9 am: 0666a0b10f am: ae51c1fac8Xin Li
am: 2aa50ff559 Change-Id: Iff5d56cfc823e724d87722aad05e4b84cb7b7934
2018-08-07Merge Android Pie into master am: d739e134e9 am: 0666a0b10fXin Li
am: ae51c1fac8 Change-Id: Id7c75fa5708c34b67795e6e75915a016227269bc
2018-08-07Merge Android Pie into master am: d739e134e9Xin Li
am: 0666a0b10f Change-Id: I3c3d558499014d6d7733bd61590ac485740b145c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 06:54:29 +0000