summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-22[automerger skipped] Add product partition file support am: 9feca325c6 -s ↵android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100Bill Yi
ours am: 3cdb8d085f -s ours am skip reason: Change-Id I2e86176285b888a923cb44278767af9f16710635 with SHA-1 8e95629656 is in history Change-Id: I50fe07215f991a0f09d02cac3f270e4eac79588c
2020-05-22[automerger skipped] Add product partition file support am: 9feca325c6 -s oursandroid11-devBill Yi
am skip reason: Change-Id I2e86176285b888a923cb44278767af9f16710635 with SHA-1 8e95629656 is in history Change-Id: I215bc849465590d9dbc2f3d783f62853dab5eeb3
2020-05-22Add product partition file supportBill Yi
This is needed for Sunfish too. TEST: build and flashed coral. Made phone call and text message. BUG: 145289377 BUG: 152444305 Merged-In: I201ac6c73a3658b38ae3790d9a90c9805f656ad5 Merged-In: I2e86176285b888a923cb44278767af9f16710635 Change-Id: I201ac6c73a3658b38ae3790d9a90c9805f656ad5 (cherry picked from commit 38ff933a4ea9dc8b8b96ad91b33c7851e220c693)
2020-04-09Add product partition file supportBill Yi
TEST: build and flashed coral. Made phone call and text message. BUG: 152444305 Change-Id: I2e86176285b888a923cb44278767af9f16710635
2020-03-31generate-android-bp-for-blobs.sh: Add module ownerYo Chiang
Optionally specify owner so PRODUCT_RESTRICT_VENDOR_FILES don't break. Bug: 152277096 Test: None. Change-Id: Ifef8865745443b9c9f394a7ee560a9ea17439c46
2020-03-26Add script to generate Android.bp for AOSP blobYo Chiang
The Android.bp checked in to the device/../self-extractors directory must be renamed to something like Android.bp.txt so that it don't pollute normal build environments. Bug: 152277096 Test: $ SYSTEM_EXT_SPECIFIC=true \ ./generate-android-bp.sh <path to blobs> > Android.bp.txt Change-Id: I0f3abbfc6092ed61ddcef5971bbfebed4cbc1a91
2020-02-25Add support for floral path sytem_extBill Yi
BUG: 149760649 TEST: generated vendor blobs on rvc-release Change-Id: Ie35edada9900ec120c7b24d36af7bd63aa3444fd
2020-01-16[automerger skipped] DO NOT MERGE - Merge ↵Automerger Merge Worker
qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: bfe0285725 am: 5dec9afb75 -s ours am skip reason: subject contains skip directive Change-Id: Iaff99c972d4e9a367f4bfea36e08ed5c47b2717b
2020-01-16DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Automerger Merge Worker
stage-aosp-master am: bfe0285725 Change-Id: I27c87d4e82bd0abe94a6a60088bbe917bd981686
2020-01-15DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵android10-sidebranchXin Li
stage-aosp-master Bug: 146167222 Change-Id: I90fe9945822d5169ff12e9b5f3a49373c0162d7a
2019-12-03[automerger skipped] Copy Android.mk for all vendors am: a766aad799 -s ours ↵Automerger Merge Worker
am: d4ad362be6 -s ours am skip reason: Change-Id Ibea15ac3647ed4dca38bcf68ca336bc9154a7328 with SHA-1 d88009ebcf is in history Change-Id: Ic072108eb799e7d1609fbdd856a6fb66f0b25f6c
2019-12-03[automerger skipped] Copy Android.mk for all vendors am: a766aad799 -s oursAutomerger Merge Worker
am skip reason: Change-Id Ibea15ac3647ed4dca38bcf68ca336bc9154a7328 with SHA-1 d88009ebcf is in history Change-Id: Ic78cf463cb7f89a0b8f42d4a18912e46ab41907c
2019-12-03Copy Android.mk for all vendorsandroid-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android10-qpr3-s1-releaseandroid10-qpr3-releaseBill Yi
BUG:143903156 Merged-In: Ibea15ac3647ed4dca38bcf68ca336bc9154a7328 Change-Id: Ibea15ac3647ed4dca38bcf68ca336bc9154a7328 (cherry picked from commit d88009ebcfd9c2b53c7f2af6f1d12ec5725d8417)
2019-11-12Merge "Create LICENSE file automatically." am: 5664689ad1 am: 587fc20905Xin Li
am: 3b9a13d828 Change-Id: I1c7d0ca189fa8c9be267ba497f4527c30d362aa3
2019-11-12Merge "Create LICENSE file automatically." am: 5664689ad1Xin Li
am: 587fc20905 Change-Id: I6f68080f9316bd8d603de314f56d35315ff0d00e
2019-11-12Merge "Create LICENSE file automatically."android-r-preview-1Xin Li
am: 5664689ad1 Change-Id: I168832c9478dbed6509f7b78b85124e14ea2d055
2019-11-13Merge "Create LICENSE file automatically."Treehugger Robot
2019-11-12Create LICENSE file automatically.Xin Li
Bug: 144378401 Fixed: 144378401 Change-Id: I3817d44dedbfa844430ba194c14f444ab005ced4
2019-11-05Copy Android.mk for all vendorsBill Yi
am: d88009ebcf Change-Id: I4920d9445707da09ae8cc4e681acdecc9e325268
2019-11-04Copy Android.mk for all vendorsBill Yi
BUG:143903156 Change-Id: Ibea15ac3647ed4dca38bcf68ca336bc9154a7328
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 861b9df2b7 am: 0fcb6ec74c -s ours am skip reason: subject contains skip directive Change-Id: Ib292ca439ab2c0a6b17fde909c1ef116537048d9
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 861b9df2b7 Change-Id: Iea70dc3527c976f33b18a2a027bab425b3b447c1
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ibdffbbb2fca9c708a807ac9b93838eff3f3f1231
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 401b47878c -s ↵Xin Li
ours am: 0ad8503833 -s ours am: 15a43f5d3f -s ours am: 1dfee11cb7 -s ours am skip reason: change_id Iccdbb0b411486412558738c43dbb47dab1bdad72 with SHA1 f456b5a32c is in history Change-Id: I8d41957865f7e497f2ea2b13be5a87cba611fa6e
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 401b47878c -s ↵Xin Li
ours am: 0ad8503833 -s ours am: 15a43f5d3f -s ours am skip reason: change_id Iccdbb0b411486412558738c43dbb47dab1bdad72 with SHA1 f456b5a32c is in history Change-Id: I5d319c74ee3d55c98d6285c7a8d68860683dbfc2
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP master am: 401b47878c -s oursXin Li
am: 0ad8503833 -s ours am skip reason: change_id Iccdbb0b411486412558738c43dbb47dab1bdad72 with SHA1 f456b5a32c is in history Change-Id: I83c38fe26fe669772c2521a4b76511d247e4b110
2019-10-26[automerger skipped] Merge Coral/Flame into AOSP masterXin Li
am: 401b47878c -s ours am skip reason: change_id Iccdbb0b411486412558738c43dbb47dab1bdad72 with SHA1 f456b5a32c is in history Change-Id: I44d10310939e1549dd85492d7234dfbc4fd2f106
2019-10-25Merge Coral/Flame into AOSP masterXin Li
Bug: 141248619 Change-Id: I8858babbec88419307e326f0897623084a00b46c Merged-In: Iccdbb0b411486412558738c43dbb47dab1bdad72
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: f456b5a32c am: 39a110a330Xin Li
am: c9e596ba2f Change-Id: Ib0a1693acc05b6d5e2325e05e0fc82e44426964e
2019-10-16Skip QD1A.190821.011 in stage-aosp-master am: f456b5a32cXin Li
am: 39a110a330 Change-Id: I6cb57f7ae61e5767338198a6c7afc40f7cda7949
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: f456b5a32c Change-Id: Ib65138bf8e3b88dc31fc54bf327db93be4eaab8f
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterb_141248619Xin Li
Bug: 141248619 Change-Id: Iccdbb0b411486412558738c43dbb47dab1bdad72
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 473a9f7d6d -s ours am: 3c7679b896 -s ours am: 7977efdf8d -s ours am skip reason: change_id Ia7f8c4578dc1ba649b52cb76e0aa131c46d69c6f with SHA1 50333b2df7 is in history Change-Id: I8f9852b0ecdceb0616a5d102767222f06851c90c
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 473a9f7d6d -s ours am: 3c7679b896 -s ours am skip reason: change_id Ia7f8c4578dc1ba649b52cb76e0aa131c46d69c6f with SHA1 50333b2df7 is in history Change-Id: I30c5477da340622ebe398b2a1e3dd4d76074852d
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 473a9f7d6d -s ours am skip reason: change_id Ia7f8c4578dc1ba649b52cb76e0aa131c46d69c6f with SHA1 50333b2df7 is in history Change-Id: I27616f4852480ae5ea7825a02043f421e3401586
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
Bug: 135460123 Change-Id: I438f9d7dcb3e94b24670a2352baa3a1bfd5e4024 Merged-In: Ia7f8c4578dc1ba649b52cb76e0aa131c46d69c6f
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
8b940ce5a5 -s ours am: b7f7696d47 am: e0180da523 am: 4a4c157e50 -s ours am skip reason: subject contains skip directive Change-Id: I9f813a5fcbfbb18f1a50820d9dc3d81910d082b1
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
8b940ce5a5 -s ours am: b7f7696d47 am: e0180da523 Change-Id: Idc84fe7efecda69edb00faeace00024adcd77ef7
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
8b940ce5a5 -s ours am: b7f7696d47 Change-Id: I8e164ae5eeadfa465ce819182efd3a34e07232ac
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 8b940ce5a5 -s ours am skip reason: subject contains skip directive Change-Id: I4740dd31e9716b05dc14ac5731da5a152c8b9370
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: Ia7f8c4578dc1ba649b52cb76e0aa131c46d69c6f
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 8f6a651129 -s ours am: 2a52abc47c am: 6316f60fed -s ours am skip reason: subject contains skip directive Change-Id: I7690575b3a8a352f14e8cb34fa3c84c66577a8bd
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 8f6a651129 -s ours am: 2a52abc47c Change-Id: I780993d38f134b4133167dd4907d319e1cb12043
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵temp_140451723Xin Li
(5699924) into stage-aosp-master am: 8f6a651129 -s ours am skip reason: subject contains skip directive Change-Id: Iee2cfe67d1336833703380d1460ff038698fa251
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I8bc70b8b0a1672dd2b97f2783b3f24da69b7f193
2019-06-10Snap for 5647767 from 86679dc4aa80cedcbda853103637d92240cd9310 to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: I1b77756f888dd5eeb812b411a23eabc94d7f85de
2019-06-06Add coral/flame support in common scripts am: 86679dc4aaBill Yi
am: 129d3786f8 Change-Id: I550590046bdae4744b35cd4411b093cef0efb486
2019-06-06Add coral/flame support in common scriptsBill Yi
am: 86679dc4aa Change-Id: I74ce2ba4a48d3b4af4d8683e50631086fbea67cf
2019-06-05Add coral/flame support in common scriptsandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android10-qpr1-mainline-releaseandroid10-mainline-media-releaseBill Yi
Done a little bit refactoring so we don't need to explicitly add new devices any more. TEST:generated blobs and build with the qt aosp source, flashed devices BUG:130808032 Change-Id: Ia4f6f807dd3ff15dd78722331890e991dfc6430c
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 03:56:30 +0000