summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732a am: bb1ac0b977android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseRoman Kiryanov
Change-Id: I058a0da66a9f4d616ec4b8d8903775c17afbaded
2020-05-18Import goldfish soong namespaces to mini_common.mk am: 31a435732aandroid-11.0.0_r16android11-d1-b-releaseRoman Kiryanov
Change-Id: I5278cd1be63eeb81fd8df82f5ed3e8057cb99188
2020-05-14Import goldfish soong namespaces to mini_common.mkandroid11-devRoman Kiryanov
Bug: 154151802 Test: presubmit Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: I58e0b35fd548b42717d333682fb1f5653424777c
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 90ffc33a7c am: 66a3702708 -s ours am skip reason: subject contains skip directive Change-Id: I5ef9291bd9cc2d33c50e3fac2e8cafb46922de87
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 90ffc33a7c Change-Id: I0d245bf8446a4a3500a98f7d1a8945098527f4ab
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I9c61b926ea2132819e1f07a101e67af9d86eae5d
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: de1b4be0c4 -s ours am: 8081ebca4f -s ours am: accd557c7e -s ours am skip reason: change_id I67e45067cbd831b3a64e6a41b3553de9cbcbc192 with SHA1 a71181c20f is in history Change-Id: I56cf957fba746f72e2d55095f8e92d5cb49f48e7
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: de1b4be0c4 -s ours am: 8081ebca4f -s ours am skip reason: change_id I67e45067cbd831b3a64e6a41b3553de9cbcbc192 with SHA1 a71181c20f is in history Change-Id: I55d1a24f5c8057caf91bba39ba62a1efbb00d540
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: de1b4be0c4 -s ours am skip reason: change_id I67e45067cbd831b3a64e6a41b3553de9cbcbc192 with SHA1 a71181c20f is in history Change-Id: I3a4b943b00edd5279ad844cc950a317b504c23a1
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I6bbad1fb8e66cc2c7a53db7e580799833f2a7bcd Merged-In: I67e45067cbd831b3a64e6a41b3553de9cbcbc192
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
f1f1b0a013 -s ours am: 69c71026da am: f89e11c498 am: 96ff85d158 -s ours am skip reason: subject contains skip directive Change-Id: I41c0de3e09444fddf3d3f6f4cdb06290f7bf6fab
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
f1f1b0a013 -s ours am: 69c71026da am: f89e11c498 Change-Id: I4259052abe2dd0c95e26a1fcee8fc333aac49aa0
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
f1f1b0a013 -s ours am: 69c71026da Change-Id: I5fefac2de08abde75cfb4709ec9e104fb81b1a95
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: f1f1b0a013 -s ours am skip reason: subject contains skip directive Change-Id: Ifbba0f9d672853bb53a5fc4b80b51f01a1be1838
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: I67e45067cbd831b3a64e6a41b3553de9cbcbc192
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: cd664d9966 am: 771223db7e -s ours am skip reason: subject contains skip directive Change-Id: Icec42228d71cfde746539dc7aa7d20f77699f639
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: cd664d9966 Change-Id: I0039a601cd87cd23fe1db8aef96734d8e5a6ed5c
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I0c13cc93261f1c848252bd44c1f4cba1ab782b58
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-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: 19720b2659 -s ours am skip reason: subject contains skip directive Change-Id: I622c461a1869cc7ecbc3f0dfaa8db557eb1120fe
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: Ib64cb66450722fc5d4ce8b3ce0ebae7f68934d0a
2019-01-16Remove wifilogd from armv7-a-neon .mkDavid Su
Remove wifilogd from armv7-a-neon .mk Bug: 113655028 Test: compiles Change-Id: Id7c89fb5450ad46a724c554b6cd124d284ee1407
2018-12-21[automerger skipped] Merge "Push cameraserver downstream from ↵Patrik Fimml
base_system.mk." am: 8f3d20ffbf am: dd574b241d -s ours am: fb171fba59 -s ours Change-Id: I26e2c3c7cb2846f818519afce0f6364b97170f36
2018-12-21[automerger skipped] Merge "Push cameraserver downstream from ↵Patrik Fimml
base_system.mk." am: 8f3d20ffbf am: dd574b241d -s ours Change-Id: Ia8c95ce84bb61e99dd7485f5c444d2cdd5fb1400
2018-12-21Merge "Push cameraserver downstream from base_system.mk."Patrik Fimml
am: 8f3d20ffbf Change-Id: I2248a1a473094c50859baf048063c3105eeb1173
2018-12-21Merge "Push cameraserver downstream from base_system.mk."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releasePatrik Fimml
2018-12-12Push cameraserver downstream from base_system.mk.Patrik Fimml
Some non-phone form factors don't want cameraserver to save storage and RAM. Pushing it down to handheld and other build files allows selective inclusion to happen there. Intended to be a no-op refactoring, will disable for ATV in a follow-up CL. Bug: 118369095 Test: built system image for random device as smoke test Change-Id: Id10728d86b6589fc77a1e6ca15e3254e2fc96f1a Merged-In: Id10728d86b6589fc77a1e6ca15e3254e2fc96f1a
2018-12-06Push cameraserver downstream from base_system.mk.Patrik Fimml
am: c998695e05 Change-Id: I315baff4f8cd3cbcf0c102a2af6929640979f4b3
2018-11-23Push cameraserver downstream from base_system.mk.Patrik Fimml
Some non-phone form factors don't want cameraserver to save storage and RAM. Pushing it down to handheld and other build files allows selective inclusion to happen there. Intended to be a no-op refactoring, will disable for ATV in a follow-up CL. Bug: 118369095 Test: built system image for random device as smoke test Change-Id: Id10728d86b6589fc77a1e6ca15e3254e2fc96f1a
2018-06-27Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356 am: ↵Anton Hansson
98c1add8d0 am: 133e4a7fac Change-Id: I6b61791a4998a2177b8a7e0668f9c2b4a5672b75
2018-06-27Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356android-wear-8.0.0_r2android-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-fcsandroid-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseAnton Hansson
am: 98c1add8d0 Change-Id: I7f33e9934066f2babd08a67667b3f70742c13401
2018-06-27Merge "Inline contents of core_base.mk in mini_common.mk"android-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-releaseAnton Hansson
am: ee034bd356 Change-Id: Ia7ddb4a102609444fb839df5b53022cfb9bcb4a2
2018-06-27Merge "Inline contents of core_base.mk in mini_common.mk"android-p-preview-5android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2Anton Hansson
2018-06-27Inline contents of core_base.mk in mini_common.mkAnton Hansson
core_base.mk is being deleted, so inline its contents in its children. Bug: 80410283 Test: diff product variables with multiproduct_kati Change-Id: I5966251e20c0accd557abc319dea47c71e61cf9a
2017-02-21Merge "Revert "Replace hardware features conf file to be emulator specific"" ↵android-wear-p-preview-2android-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-wear-8.1.0_r1android-wear-8.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-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-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-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-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-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_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_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_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21security-pi-releasesecurity-oc-mr1-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-devoreo-vts-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6Colin Cross
am: 15314896f3 am: dd168c481d am: 9533fad235 Change-Id: Idb0b1e00fb54e43eca0533f242ae0914ccd1bc58
2017-02-21Merge "Revert "Replace hardware features conf file to be emulator specific"" ↵Colin Cross
am: 15314896f3 am: dd168c481d Change-Id: I32933296c35d8251df0ca24c48ca7a05fa72cda1
2017-02-21Merge "Revert "Replace hardware features conf file to be emulator specific""android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4Colin Cross
am: 15314896f3 Change-Id: Ib24338583e6cfd282ee7d57cab07e55adabbad16
2017-02-21Merge "Revert "Replace hardware features conf file to be emulator specific""android-o-preview-1android-n-mr2-preview-2o-previewColin Cross
2017-02-18Revert "Replace hardware features conf file to be emulator specific"Colin Cross
This reverts commit 337feff8b79e1aa8c50ef7d8d15e9076385e136b. Change-Id: I17323c6053a42f4cc0fbb902cfd101f7783f7e29
2017-02-18Revert "Replace hardware features conf file to be emulator specific"Colin Cross
This reverts commit 337feff8b79e1aa8c50ef7d8d15e9076385e136b. Change-Id: I17323c6053a42f4cc0fbb902cfd101f7783f7e29
2017-02-18Merge "Replace hardware features conf file to be emulator specific" am: ↵Pulkit Bhuwalka
25571a9496 am: 7762cee053 am: c9d69d6c79 Change-Id: Ifa3ecb1b911be2a80c197c9636fa9b8125ed86cd
2017-02-17Merge "Replace hardware features conf file to be emulator specific" am: ↵Pulkit Bhuwalka
25571a9496 am: 7762cee053 Change-Id: I9f534dda8e0fc540e0feaab38d98f5c18a959b2c
2017-02-17Merge "Replace hardware features conf file to be emulator specific"Pulkit Bhuwalka
am: 25571a9496 Change-Id: I265f797d72e72f0e0b03d22627a05eff301b1df1
2017-02-17Merge "Replace hardware features conf file to be emulator specific"Treehugger Robot
2017-02-15Replace hardware features conf file to be emulator specificPulkit Bhuwalka
The mini_common.mk file gets used only for emulators which should have bluetooth disabled. Using the default handheld_core_hardware.xml file has bluetooth enabled. We should use the generic handheld_core_hardware.xml file for emulators which has bluetooth disabled. It's presence causes problems upstream in SystemServer when BluetoothService starts and requires an extra emulator config change which should not be there. Bug: 35361545 Test: Verified by launching Android Emulator. It works fine and does not start bluetooth. Change-Id: Iae4bb74db703b2b036464e62be99c7c3f2e84ec9
2016-11-28remove legacy audio policy managerandroid-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-releaseEric Laurent
Change-Id: I0997955fd8c587c68ac971edbd9422251b57c14f
2016-10-06Merge "Add wifilogd to generic image" am: c278a63560 am: bc7a9d2dd4 am: ↵Mukesh Agrawal
7122eb3f3c am: d988cb11b5 Change-Id: Ic731e980b4b13e6f0ce62bada9e9cc6a77052eee
2016-10-06Merge "Add wifilogd to generic image" am: c278a63560 am: bc7a9d2dd4android-n-mr2-preview-1Mukesh Agrawal
am: 7122eb3f3c Change-Id: I87bc7414117601dba7a389b69a37cc64ae7f0ca8
2016-10-06Merge "Add wifilogd to generic image" am: c278a63560Mukesh Agrawal
am: bc7a9d2dd4 Change-Id: Idb88e9004f8c123bc484b078f5c6b3e08590b9e1
2016-10-06Merge "Add wifilogd to generic image"Mukesh Agrawal
am: c278a63560 Change-Id: I17a0285cc61f09b9ef089cc11ddb939794985dec
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 06:55:46 +0000