summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵HEADt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-u-beta-1-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Sasha Smundak
9e36b43573 am: df6d1d9312 am: 72225af0be am: 507c5fb10e am: b95df1b813 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1871696 Change-Id: I0a4540b54b5b6715eb4c87b340e6d52786d4f546
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
9e36b43573 am: df6d1d9312 am: 72225af0be am: 507c5fb10e Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1871696 Change-Id: If68d4b02602c634e3bcd3c48dbef9d9fd7a75663
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Sasha Smundak
9e36b43573 am: df6d1d9312 am: 72225af0be Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1871696 Change-Id: Ie31f898aefba528e17421fd5924a1cd93bf21bc4
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
9e36b43573 am: df6d1d9312 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1871696 Change-Id: I07d411efd9d5cbb8c9510db7ba03ffd04fb9428d
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
9e36b43573 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1871696 Change-Id: I4cb4a0825595658d6ec8fdbcd74bf358ca56bb91
2021-10-28Replace is-board-platform[-in-list] with is-board-platform[-in-list]2Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-board-platform' --include '*.mk' --exclude 'utils_test.mk' --exclude 'utils_sample_usage.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/ifeq +\(\$\(call is-board-platform,(.*)\), *true\)/ifneq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform,(.*)\), *\)/ifeq (,$(call is-board-platform2,\1))/ s/ifneq +\(\$\(call is-board-platform,(.*)\), *true\)/ifeq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifneq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *false\)/ifeq (,T) # TODO: remove useless check/ s/ifneq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/\$\(call is-board-platform,(.*)\)/$(call is-board-platform2,\1)/ EOF ) $files ``` Change-Id: I5696bd9bcce29e5f87ebec7780b991d6d7d37585
2021-10-26[automerger skipped] Replace is-platform-sdk-version-at-least calls with ↵Sasha Smundak
checking IS_AT_LEAST_xxx. am: c3c73bc9fe am: 7278d2adfe -s ours am: c64623bb23 -s ours am: ad069582a6 -s ours am: 066c75b25a -s ours am skip reason: Merged-In I7c8cb80f287a1bfc78fdedbf86c753d305d41b8e with SHA-1 6531701f50 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1867244 Change-Id: Ie6fef44dfc0406d652acede4fb234a4b912a5c7b
2021-10-26[automerger skipped] Replace is-platform-sdk-version-at-least calls with ↵Sasha Smundak
checking IS_AT_LEAST_xxx. am: c3c73bc9fe am: 7278d2adfe -s ours am: c64623bb23 -s ours am: ad069582a6 -s ours am skip reason: Merged-In I7c8cb80f287a1bfc78fdedbf86c753d305d41b8e with SHA-1 6531701f50 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1867244 Change-Id: Ia0dd92f5f9219d9c3e33a600db7ef02baa0eaf54
2021-10-26[automerger skipped] Replace is-platform-sdk-version-at-least calls with ↵Sasha Smundak
checking IS_AT_LEAST_xxx. am: c3c73bc9fe am: 7278d2adfe -s ours am: c64623bb23 -s ours am skip reason: Merged-In I7c8cb80f287a1bfc78fdedbf86c753d305d41b8e with SHA-1 6531701f50 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1867244 Change-Id: Icc0c29e9b5e454417d414900f4f8b3a3b8092cf3
2021-10-26[automerger skipped] Replace is-platform-sdk-version-at-least calls with ↵Sasha Smundak
checking IS_AT_LEAST_xxx. am: c3c73bc9fe am: 7278d2adfe -s ours am skip reason: Merged-In I7c8cb80f287a1bfc78fdedbf86c753d305d41b8e with SHA-1 6531701f50 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1867244 Change-Id: If07ec4c0095a5b5980d14d7993d2de50349961a1
2021-10-26Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: c3c73bc9fe Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1867244 Change-Id: I5b3ed64fa4a8936eaa28a6579c3b1400d563061e
2021-10-21Replace is-platform-sdk-version-at-least calls with checking IS_AT_LEAST_xxx.android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` declare -r files="$(grep -rlP '^[^#]*call +is-platform-sdk-version-at-least' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/^([^#]*ifn?eq) +\(\$\(call is-platform-sdk-version-at-least, *(16|17|18|19|20|21|22|23|24|25)\), *true\)/\1 \(T,T\) \# TODO: Obsolete, please remove/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *26\), *true\)/\1if\2def IS_AT_LEAST_OPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *27\), *true\)/\1if\2def IS_AT_LEAST_OPM1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *28\), *true\)/\1if\2def IS_AT_LEAST_PPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *29\), *true\)/\1if\2def IS_AT_LEAST_QP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *30\), *true\)/\1if\2def IS_AT_LEAST_RP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *31\), *true\)/\1if\2def IS_AT_LEAST_SP1A/ EOF ) $files ``` Change-Id: I41a8a0644d35845e294a75afa4ac42218542d6e7 Merged-In: I7c8cb80f287a1bfc78fdedbf86c753d305d41b8e
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 6531701f50 am: f274523a00 am: eb04e7202d Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/15975243 Change-Id: I14cbf461343930daec76b87615fc80db42d64bae
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 6531701f50 am: f274523a00 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/15975243 Change-Id: I5f924984f77279741c1e831dc4f664a53fabcfef
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 6531701f50 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/15975243 Change-Id: I1aaa85917c49a3e0b54ebd347dbcdc5104c16aec
2021-10-04Replace is-platform-sdk-version-at-least calls with checking IS_AT_LEAST_xxx.Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-platform-sdk-version-at-least' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/^([^#]*ifn?eq) +\(\$\(call is-platform-sdk-version-at-least, *(16|17|18|19|20|21|22|23|24|25)\), *true\)/\1 \(T,T\) \# TODO: Obsolete, please remove/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *26\), *true\)/\1if\2def IS_AT_LEAST_OPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *27\), *true\)/\1if\2def IS_AT_LEAST_OPM1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *28\), *true\)/\1if\2def IS_AT_LEAST_PPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *29\), *true\)/\1if\2def IS_AT_LEAST_QP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *30\), *true\)/\1if\2def IS_AT_LEAST_RP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *31\), *true\)/\1if\2def IS_AT_LEAST_SP1A/ EOF ) $files ``` Change-Id: I7c8cb80f287a1bfc78fdedbf86c753d305d41b8e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 91d0cdb704 -s ↵Xin Li
ours am: 59d3007042 -s ours am: 57492b2d9f -s ours am skip reason: Change-Id I763045af2eeb185dba54baf191984b7343c593d1 with SHA-1 62d40c0059 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iba2aaf3636cf4839e57627b6d63aa4f0b25b45c9
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/media am: 5390cef1c3 ↵Bob Badour
am: 2066741890 am: b0f9643dff am: 7979e58e43 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1588041 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a3fe30a4e0c2cb88bdff032aa7409790dd277ad
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 91d0cdb704 -s ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devXin Li
ours am: 59d3007042 -s ours am skip reason: Change-Id I763045af2eeb185dba54baf191984b7343c593d1 with SHA-1 62d40c0059 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id0e76eeae20c91413525e462372360073b14e90c
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/media am: 5390cef1c3 ↵Bob Badour
am: 2066741890 am: b0f9643dff Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1588041 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9c447f94fac9380d858e2982eb7318ff930eb426
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 91d0cdb704 -s oursXin Li
am skip reason: Change-Id I763045af2eeb185dba54baf191984b7343c593d1 with SHA-1 62d40c0059 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic1bed89298c90d659ebbc4d178c294da65292391
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: I763045af2eeb185dba54baf191984b7343c593d1 Change-Id: I0881f554190e54d83bd82dc8071338281e6c0cfd
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/media am: 5390cef1c3 ↵Bob Badour
am: 2066741890 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1588041 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idd98783499cd9a9167393c093a0b07f4718ba1fc
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/media am: 5390cef1c3Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1588041 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id45ff5673119302c169360b81647651400f0c000
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/mediaBob Badour
Added SPDX-license-identifier-Apache-2.0 to: libstagefrighthw/Android.mk Added SPDX-license-identifier-BSD to: libc2dcolorconvert/Android.mk libplatformconfig/Android.mk mm-video-v4l2/vidc/common/Android.mk mm-video-v4l2/vidc/vdec/Android.mk mm-video-v4l2/vidc/venc/Android.mk Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: mm-core/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iead7f221951694cd9da8358ce5d18ac9f34b52dd
2020-11-25Mark ab/6881855 as merged am: eacf1e591d am: 62d40c0059Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/13112982 Change-Id: Ib8666b52fdc1b5b52de0fbdce295129ca72ed02a
2020-11-25Mark ab/6881855 as merged am: eacf1e591dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/13112982 Change-Id: I763045af2eeb185dba54baf191984b7343c593d1
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I1625ade045c2046920d7f12331e03eb1b544b5b3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a14b455ec9 -s ours am: ↵Xin Li
40880c91b9 -s ours am: 0b0dd1b5e2 -s ours am skip reason: Change-Id I26c57e6419abe6f812ca7c3003f6977fafa60cfb with SHA-1 3438fd95ab is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12796094 Change-Id: I0447a5b4425fe4e7418e37de248eec43e4081a52
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a14b455ec9 -s ours am: ↵Xin Li
40880c91b9 -s ours am skip reason: Change-Id I26c57e6419abe6f812ca7c3003f6977fafa60cfb with SHA-1 3438fd95ab is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12796094 Change-Id: I18fd2a994c73311da4dbc58fff89a4805d53df8e
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a14b455ec9 -s oursXin Li
am skip reason: Change-Id I26c57e6419abe6f812ca7c3003f6977fafa60cfb with SHA-1 3438fd95ab is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12796094 Change-Id: Ifa1bd395c9e5d1b595536c9c67f3c27ba165960b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I26c57e6419abe6f812ca7c3003f6977fafa60cfb Change-Id: Ie016843c20b9f64e91bfc306e287a2fbaf87a7dd
2020-09-11[automerger skipped] Merge Android R am: 7a251f0a63 -s ours am: 498ccd3367 ↵Xin Li
-s ours am: a9b3f77201 -s ours am: ea2e787ba4 -s ours am: 6afe49bd79 -s ours am skip reason: Change-Id I6572157ab6f75fefb67d7fbc24e9529df8c17743 with SHA-1 acb4b2d440 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1422401 Change-Id: Idbc23f5c4f5fd0542c0abefec627faf65b07fa52
2020-09-11[automerger skipped] Merge Android R am: 7a251f0a63 -s ours am: 498ccd3367 ↵Xin Li
-s ours am: a9b3f77201 -s ours am: ea2e787ba4 -s ours am skip reason: Change-Id I6572157ab6f75fefb67d7fbc24e9529df8c17743 with SHA-1 acb4b2d440 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1422401 Change-Id: Ifd2265bf8fd155f5b073a3fd4a3afd032ea37397
2020-09-11[automerger skipped] Merge Android R am: 7a251f0a63 -s ours am: 498ccd3367 ↵Xin Li
-s ours am: a9b3f77201 -s ours am skip reason: Change-Id I6572157ab6f75fefb67d7fbc24e9529df8c17743 with SHA-1 acb4b2d440 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1422401 Change-Id: Ie0d917640ba62ce604a1fbedfc5d2c358a59f37d
2020-09-11[automerger skipped] Merge Android R am: 7a251f0a63 -s ours am: 498ccd3367 ↵Xin Li
-s ours am skip reason: Change-Id I6572157ab6f75fefb67d7fbc24e9529df8c17743 with SHA-1 acb4b2d440 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1422401 Change-Id: I3f73c354708e270c6c8f0e3095f1668eef7f13bb
2020-09-11[automerger skipped] Merge Android R am: 7a251f0a63 -s oursXin Li
am skip reason: Change-Id I6572157ab6f75fefb67d7fbc24e9529df8c17743 with SHA-1 acb4b2d440 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1422401 Change-Id: I418247c7b76fb2a71d83c2ba2930af7e3e58723f
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I6572157ab6f75fefb67d7fbc24e9529df8c17743 Change-Id: I842cc3fb1a04166a28b0d778318b822c4b03214f
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: acb4b2d440 -s ours am: 7c3413361b -s ours am: aafebf55b8 -s ours am: 9400562df9 -s ours am skip reason: Change-Id I8d84faf48c0236373fcd6bed3e8355dfb50ddee5 with SHA-1 524bb0d57f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12470130 Change-Id: I4602f7fe9cdebc6ae2ace9104ef4f730abe846f8
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: acb4b2d440 -s ours am: 7c3413361b -s ours am: aafebf55b8 -s ours am skip reason: Change-Id I8d84faf48c0236373fcd6bed3e8355dfb50ddee5 with SHA-1 524bb0d57f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12470130 Change-Id: I6fbd3ae2f8147350c51141effcdbf27469a70a12
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: acb4b2d440 -s ours am: 7c3413361b -s ours am skip reason: Change-Id I8d84faf48c0236373fcd6bed3e8355dfb50ddee5 with SHA-1 524bb0d57f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12470130 Change-Id: I1e9c75df95a7d97b9b5a0f94e2584ea73b14f79c
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: acb4b2d440 -s ours am skip reason: Change-Id I8d84faf48c0236373fcd6bed3e8355dfb50ddee5 with SHA-1 524bb0d57f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12470130 Change-Id: I76d01370b3cae1953c25a8b3a17d10fc54180645
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I8d84faf48c0236373fcd6bed3e8355dfb50ddee5 Change-Id: I6572157ab6f75fefb67d7fbc24e9529df8c17743
2020-05-05Add METADATA to media: BSD+Apache2+MIT=NOTICE am: c47a643ded am: d5ea805862 ↵Bob Badour
am: 524bb0d57f am: 3438fd95ab am: 2e88eb283b Change-Id: I3989d7d7dabab5673a297253f72b07472469f832
2020-05-05Add METADATA to media: BSD+Apache2+MIT=NOTICE am: c47a643ded am: d5ea805862 ↵Bob Badour
am: 524bb0d57f am: 3438fd95ab Change-Id: I01570ad7a0653db276dee52cd57277910bd4b14f
2020-05-05Add METADATA to media: BSD+Apache2+MIT=NOTICE am: c47a643ded am: d5ea805862 ↵Bob Badour
am: 524bb0d57f Change-Id: I26c57e6419abe6f812ca7c3003f6977fafa60cfb
2020-05-05Add METADATA to media: BSD+Apache2+MIT=NOTICE am: c47a643ded am: d5ea805862Bob Badour
Change-Id: I8d84faf48c0236373fcd6bed3e8355dfb50ddee5
2020-05-05Add METADATA to media: BSD+Apache2+MIT=NOTICE am: c47a643dedandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ie2ae37c33e906e18e862cef0522ee364610d2a1c
2020-05-01Add METADATA to media: BSD+Apache2+MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I5ecb7cd75dd273c9a983184784e284666481b286
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: d05861c775 -s ours am: 6e8e1b545b am: 8e91a3b1e8 am: ba067459f6 -s ours am skip reason: subject contains skip directive Change-Id: I2d144c9bfbdc5e401f6281e32771bfd6575cdc34