summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-19Merge "Deleted clang property in Android.bp files" am: d4d41c78f5 am: ↵HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-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_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devAlix Espino
e11490cd68 am: cfb15510ed am: 4f7d38b549 am: fdee5986ff am: 339d1330cc Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/2065990 Change-Id: I66927b3d955d8c4bf2f9abe177753cfd26875201 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Deleted clang property in Android.bp files" am: d4d41c78f5 am: ↵android-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_r56android-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_r32main-16k-with-phonesandroid13-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-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseAlix Espino
e11490cd68 am: cfb15510ed am: 4f7d38b549 am: fdee5986ff Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/2065990 Change-Id: I1a027b9419ae486158d514942c538722e7833047 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Deleted clang property in Android.bp files" am: d4d41c78f5 am: ↵Alix Espino
e11490cd68 am: cfb15510ed am: 4f7d38b549 am: 2a92d7a0ba Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/2065990 Change-Id: Ib22f928fc90141d84be6d07cd47a6dd9304a1f59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Deleted clang property in Android.bp files" am: d4d41c78f5 am: ↵Alix Espino
e11490cd68 am: cfb15510ed am: 4f7d38b549 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/2065990 Change-Id: I238b7c436451e69740c9429c6cd43e8fd47aec01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Deleted clang property in Android.bp files" am: d4d41c78f5 am: ↵aml_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_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-art-releaseaml_tz4_332714010Alix Espino
e11490cd68 am: cfb15510ed am: 4f7d38b549 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/2065990 Change-Id: I69212d8a4e60c638d3c4d5730f99e26943462254 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Deleted clang property in Android.bp files" am: d4d41c78f5 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010main-16kandroid13-frc-odp-releaseandroid13-devAlix Espino
e11490cd68 am: cfb15510ed Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/2065990 Change-Id: I9f23e1b470b767099ce2ae1f18254305900146e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Deleted clang property in Android.bp files" am: d4d41c78f5 am: e11490cd68Alix Espino
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/2065990 Change-Id: Ia1e90a5cef6f032e2ada8f22f940782a1c1615bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Deleted clang property in Android.bp files" am: d4d41c78f5Alix Espino
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/2065990 Change-Id: I91093384d52a0d6e3cef49b6e338711bb97ebf00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge "Deleted clang property in Android.bp files"Alix Espino
2022-04-18Deleted clang property in Android.bp filesAlix
Deleted deprecated clang property in Android.bp files using bpmodify. Bug: 208980553 Test: treehugger Change-Id: I3f7b4853f29dd97c60e5132870fb80fd7af30cfb
2021-11-04Merge "Replace is-board-platform[-in-list] with ↵Treehugger Robot
is-board-platform[-in-list]2" am: 1bec2aa709 am: bc59b5092c am: 67e514d96a am: 02f76f3340 am: 236a904f69 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1871916 Change-Id: Ibe67e42bf1dec4df761ec6b05c5d03285a593f79
2021-11-04Merge "Replace is-board-platform[-in-list] with ↵Treehugger Robot
is-board-platform[-in-list]2" am: 1bec2aa709 am: bc59b5092c am: 67e514d96a am: 02f76f3340 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1871916 Change-Id: Ia21de6decc0d6d5c0d877aa83e3f43e2ebd83d28
2021-11-04Merge "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: 1bec2aa709 am: bc59b5092c am: 67e514d96a Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1871916 Change-Id: Ica839989174e43613d0c1d4589873db75c7386c7
2021-11-04Merge "Replace is-board-platform[-in-list] with ↵Treehugger Robot
is-board-platform[-in-list]2" am: 1bec2aa709 am: bc59b5092c Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1871916 Change-Id: Ib1d337c3ffdad76e975bf46d6458599b007db472
2021-11-04Merge "Replace is-board-platform[-in-list] with ↵Treehugger Robot
is-board-platform[-in-list]2" am: 1bec2aa709 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1871916 Change-Id: I33fa569c81f4684b784b5cf999098b3b89112d3d
2021-11-04Merge "Replace is-board-platform[-in-list] with is-board-platform[-in-list]2"Treehugger Robot
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: ``` 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 ``` There was additional manual change in msm8226/common.mk (the sccipt cannot handle continuation lines). Change-Id: Id100bea2a75f42f95fb11e632e59d3c50e2b16f3
2021-10-26[automerger skipped] Merge "Replace is-platform-sdk-version-at-least calls ↵Treehugger Robot
with checking IS_AT_LEAST_xxx." am: b9bbe00d6a am: d5ec0a400a -s ours am: beb833f5f5 -s ours am: 324d114485 -s ours am: 44751bdf4e -s ours am skip reason: Merged-In Iae8e0931842f3470420829c0313ab0dbcc1bc489 with SHA-1 5a9e2124fe is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1867224 Change-Id: I883e2561c228845caef860627216861031e1483f
2021-10-26[automerger skipped] Merge "Replace is-platform-sdk-version-at-least calls ↵Treehugger Robot
with checking IS_AT_LEAST_xxx." am: b9bbe00d6a am: d5ec0a400a -s ours am: beb833f5f5 -s ours am: 324d114485 -s ours am skip reason: Merged-In Iae8e0931842f3470420829c0313ab0dbcc1bc489 with SHA-1 5a9e2124fe is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1867224 Change-Id: Ib78fa712bfac2c313b79df613021aa3e4378295d
2021-10-26[automerger skipped] Merge "Replace is-platform-sdk-version-at-least calls ↵Treehugger Robot
with checking IS_AT_LEAST_xxx." am: b9bbe00d6a am: d5ec0a400a -s ours am: beb833f5f5 -s ours am skip reason: Merged-In Iae8e0931842f3470420829c0313ab0dbcc1bc489 with SHA-1 5a9e2124fe is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1867224 Change-Id: I809c74c49832cb77eec0e491ac9285af87cb2ac3
2021-10-26[automerger skipped] Merge "Replace is-platform-sdk-version-at-least calls ↵Treehugger Robot
with checking IS_AT_LEAST_xxx." am: b9bbe00d6a am: d5ec0a400a -s ours am skip reason: Merged-In Iae8e0931842f3470420829c0313ab0dbcc1bc489 with SHA-1 5a9e2124fe is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1867224 Change-Id: Ie549c190ee8a32abe335eea43960f9d0ce7a778d
2021-10-26Merge "Replace is-platform-sdk-version-at-least calls with checking ↵Treehugger Robot
IS_AT_LEAST_xxx." am: b9bbe00d6a Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1867224 Change-Id: I41567bd00d83c3d09cc0b4fd9252db07f0ea2315
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-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
abf3ff986d am: 651ca42903 am: 3cdd168942 am: ba6c2b14ea am: aa09ccb7c0 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1866281 Change-Id: I898eeabe7cdb8e01ce0a87b8b8745affabf7ad3e
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
abf3ff986d am: 651ca42903 am: 3cdd168942 am: ba6c2b14ea Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1866281 Change-Id: Ib7e388e68bc86f945fa7b69ea8c2357c47aabf81
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
abf3ff986d am: 651ca42903 am: 3cdd168942 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1866281 Change-Id: I5b8cba904616046cf8e4fc3f2613ef54a8393fe5
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: I61b8ce637a4cdbe874f28a09b95b29b230c5cd15 Merged-In: Iae8e0931842f3470420829c0313ab0dbcc1bc489
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
abf3ff986d am: 651ca42903 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1866281 Change-Id: Idbc944c29776db8aa057fd195d88c82a34853a10
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
abf3ff986d Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1866281 Change-Id: I33b8830e4f0483a24f66aedb2ca09507fabfcef1
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom."Treehugger Robot
2021-10-20Replace is-vendor-board-platform with is-vendor-board-qcom.Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-vendor-board-platform' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/ifeq \(\$\(call is-vendor-board-platform,QCOM\),true\)/ifneq (,$(call is-vendor-board-qcom))/ s/ifneq \(\$\(call is-vendor-board-platform,QCOM\),true\)/ifeq (,$(call is-vendor-board-qcom))/ EOF ) $files ``` Change-Id: I7808fb4fcfaf7d71bf3f09349f37dc4370a1124c
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 5a9e2124fe am: f946366cd7 am: 6759f7f16b Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/display/+/15975318 Change-Id: I39dbd5e737620e42d1f28add21eae54041a4555b
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 5a9e2124fe am: f946366cd7 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/display/+/15975318 Change-Id: I1df0f36428321094f9efb3f614f60386c950f8a3
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 5a9e2124fe Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/display/+/15975318 Change-Id: I90fd85caaddd1cd4f647e99e2a43e902e38f9396
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: Iae8e0931842f3470420829c0313ab0dbcc1bc489
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6456bf5ece -s ↵Xin Li
ours am: e1f56782a9 -s ours am: 3b52606918 -s ours am skip reason: Change-Id I469d4e7d75ec6d544b59d0733bcc8a9aee6765f0 with SHA-1 fac259d807 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc4dcd46afc815e51fcc42517eac4c053d13da48
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/display" am: ↵Bob Badour
e5a9b1d7e7 am: ed416384e3 am: a7a94287c8 am: f6db1e3327 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1588485 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibaf3ba3531a76da7be2ae363b7dd5fa328cebcab
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6456bf5ece -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: e1f56782a9 -s ours am skip reason: Change-Id I469d4e7d75ec6d544b59d0733bcc8a9aee6765f0 with SHA-1 fac259d807 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I709aa8e95b5321295500bf50aba931ccfdea3c1a
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/display" am: ↵Bob Badour
e5a9b1d7e7 am: ed416384e3 am: a7a94287c8 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1588485 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iabe089f14df587728b892439254efc26f2afea3c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6456bf5ece -s oursXin Li
am skip reason: Change-Id I469d4e7d75ec6d544b59d0733bcc8a9aee6765f0 with SHA-1 fac259d807 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I19aa0b55c1d3b1a175beaccff725bcf2380ef937
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: I469d4e7d75ec6d544b59d0733bcc8a9aee6765f0 Change-Id: I5ea5b225b15f8c0ae7a9e1617db2bcf5a6bf5859
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/display" am: ↵Bob Badour
e5a9b1d7e7 am: ed416384e3 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1588485 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I275674f97000e7183e12397621e0c396117ceea4
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/display" am: e5a9b1d7e7Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1588485 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iba847aa547195d605e0815307dfda28851ee04f2
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/display"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/displayBob Badour
Added SPDX-license-identifier-Apache-2.0 to: msm8084/liblight/Android.mk msm8084/libmemtrack/Android.mk msm8226/liblight/Android.mk msm8226/libmemtrack/Android.mk msm8909/libmemtrack/Android.mk msm8909w_3100/libmemtrack/Android.mk msm8960/liblight/Android.mk msm8960/libmemtrack/Android.mk msm8960/libtilerenderer/Android.mk msm8994/liblight/Android.mk msm8994/libmemtrack/Android.mk msm8996/liblight/Android.mk msm8996/libmemtrack/Android.mk msm8998/libmemtrack/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: msm8084/libgralloc/Android.mk msm8226/libgralloc/Android.mk msm8909/libgralloc/Android.mk msm8909w_3100/libgralloc/Android.mk msm8960/libgralloc/Android.mk msm8994/libgralloc/Android.mk msm8996/libgralloc/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: Android.bp msm8084/libcopybit/Android.mk msm8084/libhwcomposer/Android.mk msm8084/liboverlay/Android.mk msm8084/libqservice/Android.mk msm8226/libcopybit/Android.mk msm8226/libhwcomposer/Android.mk msm8226/liboverlay/Android.mk msm8226/libqservice/Android.mk msm8909/Android.bp msm8909/gralloc/Android.mk msm8909/libcopybit/Android.mk msm8909/libqservice/Android.bp msm8909/sdm/libs/hwc/Android.mk msm8909/sdm/libs/hwc2/Android.mk msm8909w_3100/libcopybit/Android.mk msm8909w_3100/libgralloc1/Android.mk msm8909w_3100/liblight/Android.mk msm8909w_3100/libqservice/Android.mk msm8909w_3100/sdm/libs/hwc/Android.mk msm8909w_3100/sdm/libs/hwc2/Android.mk msm8960/libcopybit/Android.mk msm8960/libhwcomposer/Android.mk msm8960/liboverlay/Android.mk msm8960/libqservice/Android.mk msm8994/libcopybit/Android.mk msm8994/libhwcomposer/Android.mk msm8994/liboverlay/Android.mk msm8994/libqservice/Android.mk msm8996/libcopybit/Android.mk msm8996/libgralloc1/Android.mk msm8996/libqservice/Android.mk msm8996/sdm/libs/hwc/Android.mk msm8996/sdm/libs/hwc2/Android.mk msm8998/libgralloc1/Android.mk msm8998/liblight/Android.mk msm8998/libqservice/Android.mk msm8998/sdm/libs/hwc2/Android.mk Added SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution to: msm8084/libexternal/Android.mk msm8226/libexternal/Android.mk msm8909/gpu_tonemapper/Android.mk msm8909/liblight/Android.mk msm8909w_3100/gpu_tonemapper/Android.mk msm8960/libexternal/Android.mk msm8994/libhdmi/Android.mk msm8998/gpu_tonemapper/Android.mk Added SPDX-license-identifier-BSD to: msm8084/libqdutils/Android.mk msm8084/libvirtual/Android.mk msm8226/libqdutils/Android.mk msm8226/libvirtual/Android.mk msm8909/hdmi_cec/Android.mk msm8909/libdisplayconfig/Android.mk msm8909/libdrmutils/Android.mk msm8909/libqdutils/Android.bp msm8909/sdm/libs/core/Android.mk msm8909/sdm/libs/utils/Android.mk msm8909w_3100/hdmi_cec/Android.mk msm8909w_3100/include/Android.mk msm8909w_3100/libdisplayconfig/Android.mk msm8909w_3100/libdrmutils/Android.mk msm8909w_3100/libqdutils/Android.mk msm8909w_3100/sdm/libs/core/Android.mk msm8909w_3100/sdm/libs/utils/Android.mk msm8960/libgenlock/Android.mk msm8960/libqdutils/Android.mk msm8994/libqdutils/Android.mk msm8996/hdmi_cec/Android.mk msm8996/libqdutils/Android.mk msm8996/sdm/libs/core/Android.mk msm8996/sdm/libs/utils/Android.mk msm8998/hdmi_cec/Android.mk msm8998/include/Android.mk msm8998/libdrmutils/Android.mk msm8998/libqdutils/Android.mk msm8998/sdm/libs/core/Android.mk msm8998/sdm/libs/utils/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iab98ebbf8a725b171a9cc101c8dee19c7b63f11c
2020-11-25Mark ab/6881855 as merged am: 7b9758c25f am: fac259d807Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/display/+/13112981 Change-Id: I40f933808c930610982e05d6fbc724b58af8a6bd
2020-11-25Mark ab/6881855 as merged am: 7b9758c25fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/display/+/13112981 Change-Id: I469d4e7d75ec6d544b59d0733bcc8a9aee6765f0
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ib7a643d214adfbc3ebfdfa048b0799793d3b3ebd
2020-10-24Merge "Cleanup references to system/core/base -> system/libbase" am: ↵Baligh Uddin
36e404753a am: add35fff68 am: bf6b18e353 am: 0dc745fd96 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1472191 Change-Id: Id548e62b23fdbaab6cfa281147d3c2a21ee0e32d
2020-10-24Merge "Cleanup references to system/core/base -> system/libbase" am: ↵Baligh Uddin
36e404753a am: add35fff68 am: bf6b18e353 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/display/+/1472191 Change-Id: Idbfff940be761f2d0d38c4cbf65c36dd82e09a8e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 13:30:59 +0000