aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Id1a6c9479be842a834ac2dbc9ab5aa0d38ab2e79 Change-Id: Iccd3a06933153b8d511b47066634bac316f5628e
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/speex" am: efac205348Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/speex/+/1588823 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5549f74092c041a74ddc02be4425f44983368531
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/speex"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/speexBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT legacy_notice legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iddee781569a5e2c9936349291d95b87d44a2a18b
2020-12-05Merge "Add product_available to product available modules" am: 9c10c0a664 ↵Treehugger Robot
am: 15077740f4 Original change: https://android-review.googlesource.com/c/platform/external/speex/+/1496056 Change-Id: Id1a6c9479be842a834ac2dbc9ab5aa0d38ab2e79
2020-12-05Merge "Add product_available to product available modules" am: 9c10c0a664Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/speex/+/1496056 Change-Id: Ia92b7a3da517ddddbc1ea558b347563dcf763795
2020-12-05Merge "Add product_available to product available modules"Treehugger Robot
2020-11-11Add product_available to product available modulesJustin Yun
vendor_available modules were available to product modules. However, not all vendor_available modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate product_available from vendor_available. vendor_available will not provide product available module. Bug: 150902910 Test: build Change-Id: I28134bdb1834ac582645474747e5ab28166ec169
2020-06-02[automerger skipped] Merge "Set min_sdk_version to be part of mainline ↵Jooyung Han
modules" am: 7888400011 am: 3621ece445 -s ours am: 7472936da2 -s ours am: 080ebf187e -s ours am skip reason: Change-Id Id89bcc591effc436a7c4a22f4320331d187d2ee7 with SHA-1 f11c3bb0f1 is in history Original change: undetermined Change-Id: Iac623377da3e1c1229026eee7fa08128b56cbbb1
2020-06-02[automerger skipped] Merge "Set min_sdk_version to be part of mainline ↵Jooyung Han
modules" am: 7888400011 am: 3621ece445 -s ours am: 7472936da2 -s ours am skip reason: Change-Id Id89bcc591effc436a7c4a22f4320331d187d2ee7 with SHA-1 f11c3bb0f1 is in history Original change: undetermined Change-Id: I10f3782c328fa61481df02a9052a4be75342dc23
2020-06-02[automerger skipped] Merge "Set min_sdk_version to be part of mainline ↵Jooyung Han
modules" am: 7888400011 am: 3621ece445 -s ours am skip reason: Change-Id Id89bcc591effc436a7c4a22f4320331d187d2ee7 with SHA-1 f11c3bb0f1 is in history Original change: undetermined Change-Id: Id3bacdd7372e84ded5095da1155285006cc29d11
2020-06-02Merge "Set min_sdk_version to be part of mainline modules" am: 7888400011android-r-beta-3android-r-beta-2Jooyung Han
Original change: undetermined Change-Id: I04375a952411b493fa1139ffaede3f9d0480bb5b
2020-06-02Merge "Set min_sdk_version to be part of mainline modules"Jooyung Han
2020-05-30Set min_sdk_version to be part of mainline modulesJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Merged-In: Id89bcc591effc436a7c4a22f4320331d187d2ee7 Change-Id: Id89bcc591effc436a7c4a22f4320331d187d2ee7 (cherry picked from commit f11c3bb0f1519481ce4c3c32f17c5644fcfe1d76)
2020-05-25Merge "Set min_sdk_version to be part of mainline modules am: f11c3bb0f1 am: ↵Automerger Merge Worker
c62b2c33bb am: 999f3e21f5" into rvc-qpr-dev-plus-aosp
2020-05-25Set min_sdk_version to be part of mainline modules am: f11c3bb0f1 am: ↵Jooyung Han
c62b2c33bb am: 999f3e21f5 Change-Id: I478e116d4d7a5d1767338bb2bcdafb1c1dfae80c
2020-05-25Set min_sdk_version to be part of mainline modules am: f11c3bb0f1 am: ↵Jooyung Han
52215f3574 am: 7a8454b8b0 Change-Id: I27c2f8c6c48ad0c51e436dcc9f938c2cb2e3a399
2020-05-25Set min_sdk_version to be part of mainline modules am: f11c3bb0f1 am: ↵Jooyung Han
c62b2c33bb am: 4a192d91ad Change-Id: I1782803a4099d244c1d271859ca4e9a99192b624
2020-05-25Set min_sdk_version to be part of mainline modules am: f11c3bb0f1 am: c62b2c33bbandroid-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-releaseJooyung Han
Change-Id: I865842d304daaacddfee6ca0abf8f33e250a04be
2020-05-25Set min_sdk_version to be part of mainline modules am: f11c3bb0f1 am: 52215f3574Jooyung Han
Change-Id: I321dbcb880f1c1016b4f18a427d6d11a7061b27e
2020-05-25Set min_sdk_version to be part of mainline modules am: f11c3bb0f1 am: c62b2c33bbJooyung Han
Change-Id: I7b48723e963f1d71ec135a8ac5375712fec53177
2020-05-25Set min_sdk_version to be part of mainline modules am: f11c3bb0f1Jooyung Han
Change-Id: Ic49c865673d73b0c4a3de1b6d2e8c08a56617dd1
2020-05-25Set min_sdk_version to be part of mainline modules am: f11c3bb0f1android-11.0.0_r16android11-d1-b-releaseJooyung Han
Change-Id: I767fc70f140033301689557d857c02acd97c06ad
2020-05-21Set min_sdk_version to be part of mainline modulesandroid11-devJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Change-Id: Id89bcc591effc436a7c4a22f4320331d187d2ee7
2020-04-29Merge "Add METADATA to speex: BSD+Apache2+MIT=NOTICE" am: 64e7134a7c am: ↵Treehugger Robot
1fba3a6680 am: 00b6807a8c am: c24bf2601a Change-Id: I72481c68c5a694cd242745787b01bc26f2bf0a97
2020-04-29Merge "Add METADATA to speex: BSD+Apache2+MIT=NOTICE" am: 64e7134a7c am: ↵Treehugger Robot
1fba3a6680 am: 00b6807a8c Change-Id: I7c16f1e1fb5b8ddeaa13e900860500eed4730b75
2020-04-29Merge "Add METADATA to speex: BSD+Apache2+MIT=NOTICE" am: 64e7134a7c am: ↵Treehugger Robot
1fba3a6680 Change-Id: I65bab1c487b9574920e3a72495d3afc831901969
2020-04-29Merge "Add METADATA to speex: BSD+Apache2+MIT=NOTICE" am: 64e7134a7cTreehugger Robot
Change-Id: I0940bea8f46eea079e313190480804b0f9163a21
2020-04-29Merge "Add METADATA to speex: BSD+Apache2+MIT=NOTICE"Treehugger Robot
2020-04-28Add METADATA to speex: BSD+Apache2+MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I912ee80f54530f4491ed2499156d30ce90e13054
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6170a73f93 -s ours am: da9dc72cea am: ff2efe35e0 Change-Id: Ia156440125d1a18610e2f1cbb63e23d5ae20b4f4
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6170a73f93 -s ours am: da9dc72cea Change-Id: I734ef71e09695c8e982c012e141f24bb834211cf
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 6170a73f93 -s ours am skip reason: subject contains skip directive Change-Id: I595d01caebcced481413064ab8db048838542c63
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I4c10f71b9653540635e47d02e4a1ed7bdf166a08
2020-04-08Merge "Revert "Retry: Add missing com.android.media.swcodec to ↵Treehugger Robot
apex_available"" am: e17c9588a6 am: bfc438d532 am: eaa98e8fac am: 4807b02069 Change-Id: I37c1a13bac0323798f0a26321d6a2c6bc8dd2997
2020-04-08Merge "Revert "Retry: Add missing com.android.media.swcodec to ↵Treehugger Robot
apex_available"" am: e17c9588a6 am: bfc438d532 am: eaa98e8fac Change-Id: I9f1091ce40a27eeee51da512ee3feb5b75d10f27
2020-04-08Merge "Revert "Retry: Add missing com.android.media.swcodec to ↵Treehugger Robot
apex_available"" am: e17c9588a6 am: bfc438d532 Change-Id: I28eef6aa3351728b92754c024a4ef2c65dd6252b
2020-04-08Merge "Revert "Retry: Add missing com.android.media.swcodec to ↵Treehugger Robot
apex_available"" am: e17c9588a6 am: bfc438d532 Change-Id: I3b330b31e0d84510cd2367bc480d52d5486ac678
2020-04-08Merge "Revert "Retry: Add missing com.android.media.swcodec to ↵Treehugger Robot
apex_available"" am: e17c9588a6 Change-Id: I42759d82f308ad6c829f157258f1d75e27d6c1fd
2020-04-08Merge "Revert "Retry: Add missing com.android.media.swcodec to apex_available""Treehugger Robot
2020-04-08Revert "Retry: Add missing com.android.media.swcodec to apex_available"Paul Duffin
This reverts commit 74d23b5ca9042ee3b3ced4839001fbb226fd2647. Reason for revert: Not needed The original change was made in an attempt to close a perceived hole in the apex availability checking. However, there is no such hole and so this change is unnecessary. While there is a dependency path from the apex to this module one of the dependencies in that path is from a static library to a shared library. That dependency does not result in the code that includes the static library being linked to the shared library at either build time or runtime. Therefore, the shared library is not part of the APEX and so does not need to be marked as such. Bug: 152762638 Test: m droid Change-Id: I9b08ead5cfb5fd506d8446118398e844f77eec98
2020-04-02Merge "Retry: Add missing com.android.media.swcodec to apex_available" am: ↵Treehugger Robot
e5dadf6358 am: 5cfe5957ad am: 8cd092d67d am: 3802645493 Change-Id: Ib91b1057dbc5fcbe606baccc9d4a9d7f24e1b15e
2020-04-02Merge "Retry: Add missing com.android.media.swcodec to apex_available" am: ↵Treehugger Robot
e5dadf6358 am: 5cfe5957ad am: 8cd092d67d Change-Id: I7e0f06900361f5ce0e82042fd5c2a6ae732145e3
2020-04-02Merge "Retry: Add missing com.android.media.swcodec to apex_available" am: ↵Treehugger Robot
e5dadf6358 am: 5cfe5957ad Change-Id: I48f25bdd96d7777ac7f8302d5be54ca027ad5580
2020-04-02Merge "Retry: Add missing com.android.media.swcodec to apex_available" am: ↵Treehugger Robot
e5dadf6358 am: 5cfe5957ad Change-Id: I749c7cd7162b56137428182abc247756e9b8b3ca
2020-04-02Merge "Retry: Add missing com.android.media.swcodec to apex_available" am: ↵Treehugger Robot
e5dadf6358 Change-Id: Ifd5a6b1bd9c8c14e56651cef26ebe15652533b53
2020-04-02Merge "Retry: Add missing com.android.media.swcodec to apex_available"Treehugger Robot
2020-04-02Retry: Add missing com.android.media.swcodec to apex_availablePaul Duffin
Added missing //apex_available:platform. Bug: 142935992 Test: m droid Change-Id: Id937a9166087d4ac74847c3d7e0501a572764eb7
2020-04-01Merge "Revert "Add missing com.android.media.swcodec to apex_available"" am: ↵Greg Kaiser
9995bc0215 am: 7fffb1c87a am: 7e3588fe35 am: f707416aad Change-Id: I878cac5a62482fade0a9e8402c8cc773011ce0d4
2020-04-01Merge "Revert "Add missing com.android.media.swcodec to apex_available"" am: ↵Greg Kaiser
9995bc0215 am: 7fffb1c87a am: 7e3588fe35 Change-Id: I25d25f80dea71aa1f63071e9524066578f40408c
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 22:55:53 +0000