aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-21Snap for 8857176 from a43439b27fac19e1384d643eba94c66ece21ebc7 to ↵aml_go_mpr_330912000android13-mainline-go-mediaprovider-releaseAndroid Build Coastguard Worker
mainline-go-mediaprovider-release Change-Id: I5de86e53e13a7f738cc42e3be42914043a232669
2022-07-21Pretty print metadata xml file to make it easier to readPaul Duffin
The process_compat_config.py script can generate two separate XML files. One for consumption by the device and a separate metadata XML file that are merged together and used for various tools and tests. In preparation for including the metadata into the sdk snapshot, which will be checked into git this change pretty prints the metadata to make it easier to read and review the differences. Forces the binary and test to use python3 as ElementTree.indent was only added in 3.9. Bug: 232401814 Test: atest --host process-compat-config-test CtsAppCompatHostTestCases Change-Id: I2c7efc68722eefeca397f7b4d257d5b0c0679920 (cherry picked from commit 6f55ef9b3ce9b138b96333cb7a21c166f5f128d0) Merged-In: I2c7efc68722eefeca397f7b4d257d5b0c0679920
2022-06-16Snap for 8736029 from 28011c0a34a3ede7b8213776c7fd99121e0491c1 to ↵Android Build Coastguard Worker
mainline-go-mediaprovider-release Change-Id: Ib250ea1c49255577d2eea475ee6f9413e97e8b59
2022-05-30Remove getClassDefsFromJar that accepts String jar path to clean-up ↵Harshit Mahajan
Classpaths.java Bug: b/204888276 Test: NA Change-Id: I9f5daef25ed9fa741501039f96084e279002c3e0
2022-05-21Snap for 8626064 from 2ea954fdf751b7251e104f3d3f3e7a3a2ef2e675 to ↵Android Build Coastguard Worker
mainline-go-mediaprovider-release Change-Id: I4bc172f634fc06f8329aa1af35124ccf11f97992
2022-05-06Add support for max-target-s am: 2ea954fdf7Artur Satayev
Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/18164346 Change-Id: I6a802511fd20bb877287c6520d9dda6fb6a86676 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06Add support for max-target-sandroid-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android13-devArtur Satayev
Test: make Bug: 169748350 Change-Id: I4d2a15480d4f909e3fab396cb56c38acb62028f6 Merged-In: I4d2a15480d4f909e3fab396cb56c38acb62028f6
2022-04-28Snap for 8505378 from bc8ae5e759f2f04df265057ace161e6b5c315daf to ↵Android Build Coastguard Worker
mainline-go-mediaprovider-release Change-Id: I51cf49be77d29fde9b3d58a7ffc777fa2daf43ed
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 76379eab56 -s ours am: cc03e0a873 -s ours am: bc8ae5e759 -s ours am skip reason: Merged-In Iba57d8d536d917295263228a28b997580c612b32 with SHA-1 da86959d7b is already in history Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/17805481 Change-Id: I7c13ff0a461181b5dbef69d3a83cdc99dbd0dc73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 76379eab56 -s ours am: cc03e0a873 -s ours am skip reason: Merged-In Iba57d8d536d917295263228a28b997580c612b32 with SHA-1 da86959d7b is already in history Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/17805481 Change-Id: I3d5dfcf9af3d27a30357428c19c6762decc5f171 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: 76379eab56 -s ours am skip reason: Merged-In Iba57d8d536d917295263228a28b997580c612b32 with SHA-1 da86959d7b is already in history Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/17805481 Change-Id: Ib465ac1e2c6722553aaf9644c649936a310efe20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: Iba57d8d536d917295263228a28b997580c612b32 Change-Id: I11dc8fd8af27e49ff3556ad4ab8022db96a41fca
2022-04-12Merge "Extend minimal support for maxTargetSdk post S" am: d47ce8c13b am: ↵Treehugger Robot
702326a950 am: 0f20f0ee57 am: 2aa577d9a7 Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2056816 Change-Id: Ib06013f78cfe31f430673abfec78e3b53d954d77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Extend minimal support for maxTargetSdk post S" am: d47ce8c13b am: ↵Treehugger Robot
702326a950 am: 0f20f0ee57 Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2056816 Change-Id: I31152862d849ddd82eaa917b8dd33d54660e1570 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Extend minimal support for maxTargetSdk post S" am: d47ce8c13b am: ↵Treehugger Robot
702326a950 Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2056816 Change-Id: Ib74678b96560fe48cdac38ab39cf44aceef1e4fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Extend minimal support for maxTargetSdk post S" am: d47ce8c13bTreehugger Robot
Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2056816 Change-Id: Ib7674f5c3dd474cbd3d74aabb53a660fe05c8570 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Extend minimal support for maxTargetSdk post S"Treehugger Robot
2022-04-08Convert process_compat_config to python 3 am: da86959d7b am: b95693c1fe am: ↵Cole Faust
614a270efc am: 0477267870 Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2057087 Change-Id: I2f34a72c3c2b5b0471159e6eee351dc5645a69bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08Convert process_compat_config to python 3 am: da86959d7b am: b95693c1fe am: ↵Cole Faust
614a270efc Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2057087 Change-Id: I2e58261085ee30c3d9f13f3e449d14eacb468a21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08Convert process_compat_config to python 3 am: da86959d7b am: b95693c1feCole Faust
Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2057087 Change-Id: Idc5cd5086907a11218168721f09e5877bddb02f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08Convert process_compat_config to python 3 am: da86959d7bCole Faust
Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2057087 Change-Id: Ida31c6806640a29b01563be236a3d3c984fccaf2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Extend minimal support for maxTargetSdk post SYurii Zubrytskyi
Bug: 169748350 Bug: 225745567 Test: Build Change-Id: I02c46520226e76b5c4f3412f746d9dfe88269c73
2022-04-05Convert process_compat_config to python 3Cole Faust
Bug: 203436762 Test: python3 ./process-compat-config-test.py Change-Id: Iba57d8d536d917295263228a28b997580c612b32
2022-03-25Snap for 8358831 from 009d8208384008798964aa312263bf58e6a2e2b4 to ↵Android Build Coastguard Worker
mainline-go-mediaprovider-release Change-Id: I00bac2b8872a79f7bcee5a52a765bf4b798cac56
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 980151fb40 -s ours am: ↵Maria Yang
626a7a7192 -s ours am: f9eb32be89 -s ours am: aeefee98c0 -s ours am: 009d820838 -s ours am skip reason: Merged-In Ia28acc3dcca85ba7e076bbf0bf164436eaf0c4ce with SHA-1 cfa5a189e9 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2036892 Change-Id: I24bdd0a2b6e5ee2df99634861c256fce33dcf8fe
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 980151fb40 -s ours am: ↵Maria Yang
626a7a7192 -s ours am: f9eb32be89 -s ours am: aeefee98c0 -s ours am skip reason: Merged-In Ia28acc3dcca85ba7e076bbf0bf164436eaf0c4ce with SHA-1 cfa5a189e9 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2036892 Change-Id: I50203d432e8a1f15f02d9708460a77b944f7d341
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 980151fb40 -s ours am: ↵Maria Yang
626a7a7192 -s ours am: f9eb32be89 -s ours am skip reason: Merged-In Ia28acc3dcca85ba7e076bbf0bf164436eaf0c4ce with SHA-1 cfa5a189e9 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2036892 Change-Id: I97149db5ff97736e5c9c6f704ed0cfd2b8f7dc89
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 980151fb40 -s ours am: ↵Maria Yang
626a7a7192 -s ours am skip reason: Merged-In Ia28acc3dcca85ba7e076bbf0bf164436eaf0c4ce with SHA-1 cfa5a189e9 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2036892 Change-Id: I58d4bc59b56284cb34ff555dac504361231f77dd
2022-03-22[automerger skipped] Mark ab/8191998 as merged am: 980151fb40 -s oursMaria Yang
am skip reason: Merged-In Ia28acc3dcca85ba7e076bbf0bf164436eaf0c4ce with SHA-1 cfa5a189e9 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2036892 Change-Id: I8c7d7fae21847c01655f9206e143b72a9e5b6953
2022-03-21Mark ab/8191998 as mergedandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android12L-tests-releaseandroid12L-tests-devMaria Yang
Bug: 188847863 Merged-In: Ia28acc3dcca85ba7e076bbf0bf164436eaf0c4ce Change-Id: I4d53dcfe96d250356d76d7333441e80f488649b3
2022-03-07Update unsupportedappusage annotation processor for JDK 17 am: c7a347b6b7 ↵Colin Cross
am: 396ed7ccd8 am: 3f9b0edcdc am: b3359fc2fb Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2007173 Change-Id: Idd1cf7e634fd146d763be8766dea8c32a70261cc
2022-03-07Update unsupportedappusage annotation processor for JDK 17 am: c7a347b6b7 ↵Colin Cross
am: 396ed7ccd8 am: 3f9b0edcdc Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2007173 Change-Id: I41d35b322e0a74d394b804757052e20d87a7afd0
2022-03-07Update unsupportedappusage annotation processor for JDK 17 am: c7a347b6b7 ↵Colin Cross
am: 396ed7ccd8 Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2007173 Change-Id: I5f11f55e2b32d1feb2dd1851591007de9f2d5bb6
2022-03-07Update unsupportedappusage annotation processor for JDK 17 am: c7a347b6b7Colin Cross
Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2007173 Change-Id: Ia754795c2f248c92bb95e6ff0578c17daa810311
2022-03-04Update unsupportedappusage annotation processor for JDK 17Colin Cross
JDK 17 no longer allows access to com.sun.tools.javac.code by default, use the public APIs instead. Bug: 219098645 Test: m checkbuild Change-Id: If7abf65989c0f92165f0edd34b1b3216c6f275a4
2022-02-14Remove myself from OWNERS.Mathew Inwood
Reduce bug spam for things I no longer own. Change-Id: I79e7ebda7ffb235b8addb5eaa26b3019b5b59a28
2021-12-14[automerger skipped] Merge Android 12 QPR1 am: 5a045685b3 -s ours am: ↵Xin Li
a951eae73f -s ours am: 75073ad0ed -s ours am: e01d354975 -s ours am skip reason: Merged-In I5ede845ba556f000171684dd843319895d097c5c with SHA-1 b3ec5cea42 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1921951 Change-Id: I1cb26327f4bdfde6efb99476bfa74c078fc6c4fc
2021-12-14[automerger skipped] Merge Android 12 QPR1 am: 5a045685b3 -s ours am: ↵Xin Li
a951eae73f -s ours am: 75073ad0ed -s ours am skip reason: Merged-In I5ede845ba556f000171684dd843319895d097c5c with SHA-1 b3ec5cea42 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1921951 Change-Id: Ie585023f8916a96caafb0b39e74c4673cc0868db
2021-12-14[automerger skipped] Merge Android 12 QPR1 am: 5a045685b3 -s ours am: ↵Xin Li
a951eae73f -s ours am skip reason: Merged-In I5ede845ba556f000171684dd843319895d097c5c with SHA-1 b3ec5cea42 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1921951 Change-Id: Ic57280ed77d159a7511985a3f6e07836dd057186
2021-12-14[automerger skipped] Merge Android 12 QPR1 am: 5a045685b3 -s oursXin Li
am skip reason: Merged-In I5ede845ba556f000171684dd843319895d097c5c with SHA-1 b3ec5cea42 is already in history Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1921951 Change-Id: I5537b96929d2e537017e0f76d7cb2c29deae95e7
2021-12-14Merge Android 12 QPR1android-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-1Xin Li
Bug: 210511427 Merged-In: I5ede845ba556f000171684dd843319895d097c5c Change-Id: I259ecefbd461e48e7afec6f1048e9ba4fb021f76
2021-11-18[automerger skipped] Merge "Merge ↵Xin Li
sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: b5691ede96 -s ours am: 8eda1e149b -s ours am: 9952d364dc -s ours am skip reason: Merged-In Ida9282b148033465152b6a1f69826325f02b631b with SHA-1 f0e46947a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/16278968 Change-Id: Ic5582df9ba73176e2a870aff3caa852736ff3ed8
2021-11-18[automerger skipped] Merge "Merge ↵Xin Li
sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: b5691ede96 -s ours am: 8eda1e149b -s ours am skip reason: Merged-In Ida9282b148033465152b6a1f69826325f02b631b with SHA-1 f0e46947a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/16278968 Change-Id: I53f22893dddddd93ea34fdc7bce6333ccf2dcbdb
2021-11-18[automerger skipped] Merge "Merge ↵Xin Li
sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: b5691ede96 -s ours am skip reason: Merged-In Ida9282b148033465152b6a1f69826325f02b631b with SHA-1 f0e46947a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/tools/platform-compat/+/16278968 Change-Id: I9ae80e2d1efa185e3bad8ef7da5f4b993d2d9d4d
2021-11-18Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into ↵temp_sam_210511427temp-sc-samXin Li
stage-aosp-master
2021-11-10Remove platform-compat-eng as OWNERS. am: e11e803ab2 am: b3ec5cea42 am: ↵satayev
04ac8e91e6 am: bd308c6841 am: 47b81f0b02 Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1887001 Change-Id: Ie9a0c75a9a7e70a8d830b3e77821ff1e9e99b5c7
2021-11-10Remove platform-compat-eng as OWNERS. am: e11e803ab2 am: b3ec5cea42 am: ↵satayev
04ac8e91e6 am: bd308c6841 Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1887001 Change-Id: I69513d651a0883d4553811df94a8bef2a1a5788c
2021-11-10Remove platform-compat-eng as OWNERS. am: e11e803ab2 am: b3ec5cea42 am: ↵satayev
04ac8e91e6 Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1887001 Change-Id: Ida8bddad8c3af30bfbd0bd7ab09f2ea16b442a05
2021-11-10Remove platform-compat-eng as OWNERS. am: e11e803ab2 am: b3ec5cea42satayev
Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1887001 Change-Id: I252b1baf9cb2df99d5332ae386b8be520d1dcf86
2021-11-10Remove platform-compat-eng as OWNERS. am: e11e803ab2satayev
Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/1887001 Change-Id: I5ede845ba556f000171684dd843319895d097c5c