summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-02Merge "Replace is-board-platform[-in-list] with ↵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_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-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_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_341510000aml_sch_331113000aml_sch_331111000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_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_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-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_tz5_341510010aml_tz4_332714010Treehugger Robot
is-board-platform[-in-list]2" am: 46138bfe3e am: 5c0efe0e17 am: 308bc9262a am: 27510dde36 am: 17a9af650f Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1871917 Change-Id: I7c537ebd807eaaf06b3464d748fee1385bad0110
2021-11-02Merge "Replace is-board-platform[-in-list] with ↵Treehugger Robot
is-board-platform[-in-list]2" am: 46138bfe3e am: 5c0efe0e17 am: 308bc9262a am: 27510dde36 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1871917 Change-Id: I4965974e7a066b1c8cb783acfb777d3f127e24f0
2021-11-01Merge "Replace is-board-platform[-in-list] with ↵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-1Treehugger Robot
is-board-platform[-in-list]2" am: 46138bfe3e am: 5c0efe0e17 am: 308bc9262a Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1871917 Change-Id: I0d230967a6ca5ff9d7df7c23fb9411a8401fc9da
2021-11-01Merge "Replace is-board-platform[-in-list] with ↵Treehugger Robot
is-board-platform[-in-list]2" am: 46138bfe3e am: 5c0efe0e17 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1871917 Change-Id: Ieec5908beb64630fa4468287598754f62d08c0ad
2021-11-01Merge "Replace is-board-platform[-in-list] with ↵Treehugger Robot
is-board-platform[-in-list]2" am: 46138bfe3e Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1871917 Change-Id: I6100385b02cc4c7d22016510b004a4e168df3606
2021-11-01Merge "Replace is-board-platform[-in-list] with is-board-platform[-in-list]2"Treehugger Robot
2021-10-27Replace 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: I15dbd80d20395ad6de12e1bdaa4e38b38f7893b3
2021-10-26[automerger skipped] Merge "Replace is-platform-sdk-version-at-least calls ↵Treehugger Robot
with checking IS_AT_LEAST_xxx." am: ccc932e1d8 am: be8465f541 -s ours am: 66f19b275d -s ours am: fdc20bf089 -s ours am: c2b52ca474 -s ours am skip reason: Merged-In I10eb453d883c7f6c16f6546993e7b045611e5307 with SHA-1 247f9a88ed is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1867017 Change-Id: If522538232bf1e0954d1dacee4046fb52994c6ac
2021-10-26[automerger skipped] Merge "Replace is-platform-sdk-version-at-least calls ↵Treehugger Robot
with checking IS_AT_LEAST_xxx." am: ccc932e1d8 am: be8465f541 -s ours am: 66f19b275d -s ours am: fdc20bf089 -s ours am skip reason: Merged-In I10eb453d883c7f6c16f6546993e7b045611e5307 with SHA-1 247f9a88ed is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1867017 Change-Id: I9c3d355b1603c9d8c0be4a802958fa70c5fa7b43
2021-10-26[automerger skipped] Merge "Replace is-platform-sdk-version-at-least calls ↵Treehugger Robot
with checking IS_AT_LEAST_xxx." am: ccc932e1d8 am: be8465f541 -s ours am: 66f19b275d -s ours am skip reason: Merged-In I10eb453d883c7f6c16f6546993e7b045611e5307 with SHA-1 247f9a88ed is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1867017 Change-Id: I358a62b603d870fd107cee84b0d3d012d845a963
2021-10-26[automerger skipped] Merge "Replace is-platform-sdk-version-at-least calls ↵Treehugger Robot
with checking IS_AT_LEAST_xxx." am: ccc932e1d8 am: be8465f541 -s ours am skip reason: Merged-In I10eb453d883c7f6c16f6546993e7b045611e5307 with SHA-1 247f9a88ed is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1867017 Change-Id: I0dad38aadcb365ffb61f16a081f8e9d3cc7b98da
2021-10-26Merge "Replace is-platform-sdk-version-at-least calls with checking ↵Treehugger Robot
IS_AT_LEAST_xxx." am: ccc932e1d8 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1867017 Change-Id: Ifa7bf1bd77a866cc0945c6d69ad7f08b69513bc0
2021-10-26Merge "Replace is-platform-sdk-version-at-least calls with checking ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
IS_AT_LEAST_xxx."
2021-10-21Replace 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: ``` 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: I4f53253dec25162b065f0e23dc106c9c61b55393 Merged-In: I10eb453d883c7f6c16f6546993e7b045611e5307
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 247f9a88ed am: fa2eeb5dc1 am: 9ebcbd992d Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/15975369 Change-Id: I1c00cfa97a731307242c7288d67de2dd726b4e1a
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 247f9a88ed am: fa2eeb5dc1 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/15975369 Change-Id: I43401b3abd5728ae717e11cc1e32f30163d94de9
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 247f9a88ed Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/15975369 Change-Id: I36fb82d48991ddf50e717e29033462f48ff423a9
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: I10eb453d883c7f6c16f6546993e7b045611e5307
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7016627b9a -s ↵Xin Li
ours am: cc3d844fb3 -s ours am: 3af57d8576 -s ours am skip reason: Change-Id I0362ce60cec5cb167af801f36340418d34c28fc5 with SHA-1 9cd3b671b2 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc3b3fb67ab51a9aa9b383b0bde3aa16599e4055
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/media" am: ab785d0b24 ↵Bob Badour
am: c80a54a568 am: 29db224ea0 am: cc5b96a61b Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1588402 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icb402c7cbcf0811917a7227c86ef355fe3e403c4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7016627b9a -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: cc3d844fb3 -s ours am skip reason: Change-Id I0362ce60cec5cb167af801f36340418d34c28fc5 with SHA-1 9cd3b671b2 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10649873ff5a1f0269f358d16dfbc4afd63f7e98
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/media" am: ab785d0b24 ↵Bob Badour
am: c80a54a568 am: 29db224ea0 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1588402 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I01dc75c87ba03d5287082b72a1457d971b904ca9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7016627b9a -s oursXin Li
am skip reason: Change-Id I0362ce60cec5cb167af801f36340418d34c28fc5 with SHA-1 9cd3b671b2 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6fcd6cdd0bd261d580a8cbfbaa3b360eddf96159
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: I0362ce60cec5cb167af801f36340418d34c28fc5 Change-Id: Iaec18a9d9412c43e1604f20fcb7724f3eed7428f
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/media" am: ab785d0b24 ↵Bob Badour
am: c80a54a568 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1588402 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7084373d6e499fd4bc8324e6bc27f8e7d2a0d293
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/media" am: ab785d0b24Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1588402 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib427febb4aec083278c23a0940c52ab992b65d14
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/media"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/mediaBob Badour
Added SPDX-license-identifier-Apache-2.0 to: msm8974/libstagefrighthw/Android.mk msm8996/libstagefrighthw/Android.mk msm8998/libstagefrighthw/Android.mk Added SPDX-license-identifier-BSD to: msm8974/libc2dcolorconvert/Android.mk msm8974/mm-video-legacy/DivxDrmDecrypt/Android.mk msm8974/mm-video-legacy/vidc/vdec.mk msm8974/mm-video-legacy/vidc/venc.mk msm8974/mm-video-v4l2/DivxDrmDecrypt/Android.mk msm8974/mm-video-v4l2/vidc/vdec.mk msm8974/mm-video-v4l2/vidc/venc.mk msm8996/libc2dcolorconvert/Android.mk msm8996/mm-video-v4l2/vidc/common/Android.mk msm8996/mm-video-v4l2/vidc/vdec/Android.mk msm8996/mm-video-v4l2/vidc/venc/Android.mk msm8996/videopp/Android.mk msm8998/libc2dcolorconvert/Android.mk msm8998/mm-video-v4l2/vidc/common/Android.mk msm8998/mm-video-v4l2/vidc/vdec/Android.mk msm8998/mm-video-v4l2/vidc/venc/Android.mk Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: msm8974/mm-core/Android.mk msm8974/mm-core/omxcore/Android.mk msm8996/mm-core/Android.mk msm8998/mm-core/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I7d795088bc8aba125e671ed5188bf2ccf074c0fb
2020-11-25Mark ab/6881855 as merged am: 8614cce22a am: 9cd3b671b2Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/13112983 Change-Id: Ia2380af900a0c17a79a5c79977487d420d0f1eea
2020-11-25Mark ab/6881855 as merged am: 8614cce22aXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/13112983 Change-Id: I0362ce60cec5cb167af801f36340418d34c28fc5
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I58d2ad304849d5dcc2c497a0ad1635c52c7aaa59
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 60d0f9dfda -s ours am: ↵Xin Li
b07b25f8b5 -s ours am: 4cd4ac0a3e -s ours am skip reason: Change-Id Ic51dd62e0e5222c0dc536b4b47c565ee347795bb with SHA-1 04200b2f75 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/12796877 Change-Id: I1d4911c8680ec3ffc2a9f9b8b5e864d07ac69060
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 60d0f9dfda -s ours am: ↵Xin Li
b07b25f8b5 -s ours am skip reason: Change-Id Ic51dd62e0e5222c0dc536b4b47c565ee347795bb with SHA-1 04200b2f75 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/12796877 Change-Id: Ia6ee7bac0e78384f883a758f04fce69b63c6d212
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 60d0f9dfda -s oursXin Li
am skip reason: Change-Id Ic51dd62e0e5222c0dc536b4b47c565ee347795bb with SHA-1 04200b2f75 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/12796877 Change-Id: I230267b69805af2d3c0f30e89886a3431ddbd044
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ic51dd62e0e5222c0dc536b4b47c565ee347795bb Change-Id: Icbeba512cecb9335c92f23bc3a5692cd608758d0
2020-09-13mm-video-v4l2: venc: Correction in profile check for H.264 am: 6290468c22 ↵Sanjay Singh
am: 127a8592e2 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/11999650 Change-Id: I34b3ee8956955e3c2a3f03e779a5515f0f039404
2020-09-11[automerger skipped] Merge "Merge Android R" am: 04734ced96 -s ours am: ↵Xin Li
36a4a0ba8e -s ours am: 4c3beed6d5 -s ours am: 0c146fb87b -s ours am: 31961c6991 -s ours am skip reason: Change-Id I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e with SHA-1 ce53e79382 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1422136 Change-Id: If6991ef6494e9a912b797dadf342c9c06b46ab33
2020-09-11[automerger skipped] Merge "Merge Android R" am: 04734ced96 -s ours am: ↵Xin Li
36a4a0ba8e -s ours am: 4c3beed6d5 -s ours am: 0c146fb87b -s ours am skip reason: Change-Id I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e with SHA-1 ce53e79382 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1422136 Change-Id: I27fb7bf50e63df06efd5ea150805fbba2451bd70
2020-09-11[automerger skipped] Merge "Merge Android R" am: 04734ced96 -s ours am: ↵Xin Li
36a4a0ba8e -s ours am: 4c3beed6d5 -s ours am skip reason: Change-Id I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e with SHA-1 ce53e79382 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1422136 Change-Id: I0e5e5719d5779c7ef9424e64a741c4b15a1de123
2020-09-11[automerger skipped] Merge "Merge Android R" am: 04734ced96 -s ours am: ↵Xin Li
36a4a0ba8e -s ours am skip reason: Change-Id I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e with SHA-1 ce53e79382 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1422136 Change-Id: I5a25cbcad3c24d6317caa43c58cb74e6bb76edf1
2020-09-11[automerger skipped] Merge "Merge Android R" am: 04734ced96 -s oursXin Li
am skip reason: Change-Id I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e with SHA-1 ce53e79382 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1422136 Change-Id: I3e0407bf76ab67a7dde3a4c7ba2070a80f4f0aa8
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e Change-Id: I5aa590d6a789b545d6939396ffeb20d7a4ffe970
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ce53e79382 -s ours am: 9858e4b185 -s ours am: c06bc04f21 -s ours am: 263575f776 -s ours am skip reason: Change-Id Ia9fec6dd06eedf57db3ea5b2b06e72b4dcd233f4 with SHA-1 fb57ebf88e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/12470019 Change-Id: Ic474a72fd04fc074c6a5fab1b123395552756248
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ce53e79382 -s ours am: 9858e4b185 -s ours am: c06bc04f21 -s ours am skip reason: Change-Id Ia9fec6dd06eedf57db3ea5b2b06e72b4dcd233f4 with SHA-1 fb57ebf88e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/12470019 Change-Id: Icb4c381ce97a5724534ab2c17628ace21321cc99
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ce53e79382 -s ours am: 9858e4b185 -s ours am skip reason: Change-Id Ia9fec6dd06eedf57db3ea5b2b06e72b4dcd233f4 with SHA-1 fb57ebf88e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/12470019 Change-Id: Ifc1041b6e6755567c1ff2343b819e6125ed55942
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ce53e79382 -s ours am skip reason: Change-Id Ia9fec6dd06eedf57db3ea5b2b06e72b4dcd233f4 with SHA-1 fb57ebf88e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/12470019 Change-Id: I5fcbd367dd3364ca2d66bed60e039488d3b5a77b
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ia9fec6dd06eedf57db3ea5b2b06e72b4dcd233f4 Change-Id: I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e
2020-07-01mm-video-v4l2: venc: Correction in profile check for H.264 am: 6290468c22 ↵Sanjay Singh
am: 9ad99a7ff0 am: 9147d401be am: 74a0f5af23 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/11999650 Change-Id: Ie21ffb2de4acf746400f22c5c6d29d7618bd21a0
2020-07-01mm-video-v4l2: venc: Correction in profile check for H.264 am: 6290468c22 ↵Sanjay Singh
am: fb57ebf88e am: 04200b2f75 am: 4aec57d462 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/media/+/11999650 Change-Id: I504f33dd741e69857296ebaa25590abd252c3685
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 17:20:43 +0000