aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Move SdkExtensions/proto to packages/modules/common. am: 075d07c591 am: ↵satayev2021-05-116-0/+351
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e3feab76e Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1700071 Change-Id: I0903cad711e28ed48659907b4044041549ba6565
* | \ \ \ \ \ \ Merge "Add NetworkStackApi{Current/31}Shims with min_sdk 29 to allowed_deps" ↵Treehugger Robot2021-05-111-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c94d4e4aac am: 7721d15f7d am: 08a54e7607 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1702493 Change-Id: Ie78b715b090b5ce7cd85ef6908087873ef946644
| * | | | | | | Merge "Add NetworkStackApi{Current/31}Shims with min_sdk 29 to allowed_deps" ↵Treehugger Robot2021-05-111-0/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c94d4e4aac am: 7721d15f7d Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1702493 Change-Id: I690da2a1e3016c236155fd3780adc54db61ceb5f
| | * | | | | | Merge "Add NetworkStackApi{Current/31}Shims with min_sdk 29 to allowed_deps" ↵Treehugger Robot2021-05-111-0/+2
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: c94d4e4aac Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1702493 Change-Id: I2cf639a255b770d6030b6d3039bb74c82b9a0771
| | | * | | | Merge "Add NetworkStackApi{Current/31}Shims with min_sdk 29 to allowed_deps"Treehugger Robot2021-05-111-0/+2
| | | |\ \ \ \
| | | | * | | | Add NetworkStackApi{Current/31}Shims with min_sdk 29 to allowed_depsmarkchien2021-05-111-0/+2
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are used for Tethering and NetworkStack module Bug: 182211575 Test: m Change-Id: I6d7bcffa337d0c1e50b1883f68999d2ffdf09de8
* | | | | | | Move SdkExtensions/proto to packages/modules/common. am: 075d07c591 am: ↵satayev2021-05-116-0/+351
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e3feab76e am: ad957fc7d3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1700071 Change-Id: Id279d9de8c6cab78e3b975626a450d55e27e8f61
| * | | | | | Move SdkExtensions/proto to packages/modules/common. am: 075d07c591 am: ↵satayev2021-05-116-0/+351
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e3feab76e Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1700071 Change-Id: I273cef04aa6a992eb2ab5e108ab4e62e26551267
| | * | | | | Move SdkExtensions/proto to packages/modules/common. am: 075d07c591satayev2021-05-116-0/+351
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1700071 Change-Id: I830b1efe740e30297f50c3c0b2fe8af78224a4cf
| | | * | | | Move SdkExtensions/proto to packages/modules/common.satayev2021-05-106-0/+351
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The proto definitions may be needed at build time to generate appropriate configs for the modules. Unbundled ART branches do not include packages/modules/SdkExtenstion in their manifest; so put the proto in a project that should be visible to all unbundled modules. Move any relevant tools to packages/modules/common/tools as well. Bug: 180105615 Test: m nothing Change-Id: I4efa4300553af6b321f46adb29b8cc90e4556955
* | | | | | Allowlist TextClassifierNotificationLibNoManifest sdk version 30. am: ↵Chang Li2021-04-300-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4986e116e5 am: 2f325a1cdc am: 1cd3774919 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689400 Change-Id: I67c95ea8b9696a019d8e7cac1543eb4d377aa4ee
| * | | | | Allowlist TextClassifierNotificationLibNoManifest sdk version 30. am: ↵Chang Li2021-04-301-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4986e116e5 am: 2f325a1cdc Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689400 Change-Id: Idc745e327f88f89c7c7ccdbdc5ee6a392980dc63
* | | | | | Allowlist TextClassifierNotificationLibNoManifest sdk version 30. am: ↵Chang Li2021-04-301-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4986e116e5 am: 2f325a1cdc am: 393b811f56 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689400 Change-Id: Ida49da70aff4f5b75d60648f9871ece2af0c0efd
| * | | | | Allowlist TextClassifierNotificationLibNoManifest sdk version 30. am: ↵Chang Li2021-04-301-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4986e116e5 am: 2f325a1cdc Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689400 Change-Id: I62ee785be37de8bcb31cb529d2a9ed297bb24e5e
| | * | | | Allowlist TextClassifierNotificationLibNoManifest sdk version 30. am: 4986e116e5Chang Li2021-04-301-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689400 Change-Id: I3044aa38a0e56d5a828dfe46f9a5cfa6cd0709b3
| | | * | | Allowlist TextClassifierNotificationLibNoManifest sdk version 30.Chang Li2021-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I625b4483f827be0666de7e0860db36ba47bb7b2d
* | | | | | Merge changes I9b0590b3,Ia9a6f19c am: cd130663dc am: 2ef12995a3 am: 2f6b4a66d0Anton Hansson2021-04-290-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689777 Change-Id: I33ef9cb0620092a95269df145b2328193c329730
| * | | | | Merge changes I9b0590b3,Ia9a6f19c am: cd130663dc am: 2ef12995a3Anton Hansson2021-04-291-0/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689777 Change-Id: I039f24eee71a3b6124c157a2ce9dd8cbf00990ad
* | | | | | Merge changes I9b0590b3,Ia9a6f19c am: cd130663dc am: 2ef12995a3 am: ddcbb5c540Anton Hansson2021-04-291-0/+7
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689777 Change-Id: I34dd3160028fb7d070093671cae970871ff76159
| * | | | | Merge changes I9b0590b3,Ia9a6f19c am: cd130663dc am: 2ef12995a3Anton Hansson2021-04-291-0/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689777 Change-Id: I2ba858185de2c6826defeff296e6dd94604af87b
| | * | | | Merge changes I9b0590b3,Ia9a6f19c am: cd130663dcAnton Hansson2021-04-291-0/+7
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689777 Change-Id: Iaf648c9d6a6bc7c8d5a6e95dd17f7924b9195b9a
| | | * | | Merge changes I9b0590b3,Ia9a6f19cAnton Hansson2021-04-291-0/+7
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add androidx libs with min_sdk 30 to allowed_deps Add libunwind_llvm to allowed deps
| | | | * | | Add androidx libs with min_sdk 30 to allowed_depsAnton Hansson2021-04-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain branches do not have the soong patches that fixed the min_sdk_version of java_import. Test: m apex-allowed-deps-check Change-Id: I9b0590b3989a736cc278fea90b3516eeb53e0a2c (cherry picked from commit 9f262059a1217575367aeee84e5734d587c92abb)
| | | | * | | Add libunwind_llvm to allowed depsAnton Hansson2021-04-281-0/+1
| | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed in an internal branch for certain kinds of builds. Test: m apex-allowed-deps-check Change-Id: Ia9a6f19c5591feffdc228aea360c504e46d19055 (cherry picked from commit 2b3b590d185768ce1f24bb53f554819fff2d47da)
* | | | | | Follow rename of libc_headers_arch to libc_llndk_headers am: 5eef775673 am: ↵Colin Cross2021-04-280-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed44fff308 am: 91ca7b1176 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1680165 Change-Id: If8bd1ee31dae11119ad729633c2c78253a8baf91
| * | | | | Follow rename of libc_headers_arch to libc_llndk_headers am: 5eef775673 am: ↵Colin Cross2021-04-281-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed44fff308 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1680165 Change-Id: I8e911612b565a898ccc80bf05c4a0e5c9c0880a0
* | | | | | Follow rename of libc_headers_arch to libc_llndk_headers am: 5eef775673 am: ↵Colin Cross2021-04-281-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed44fff308 am: 9dd6040a7c Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1680165 Change-Id: I538e7c651225e99f68148c813ab9164c7028ad6f
| * | | | | Follow rename of libc_headers_arch to libc_llndk_headers am: 5eef775673 am: ↵Colin Cross2021-04-281-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed44fff308 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1680165 Change-Id: I2218b564c6bd2c47fd8d6aa48e15fd242fa1b23c
| | * | | | Follow rename of libc_headers_arch to libc_llndk_headers am: 5eef775673Colin Cross2021-04-281-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1680165 Change-Id: I40158de1ec7ee358400ebff51a2f392a60118af6
| | | * | | Follow rename of libc_headers_arch to libc_llndk_headersColin Cross2021-04-261-0/+1
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 170784825 Test: m checkbuild Change-Id: Idfc5b493eb499f8d80c6c205d6ae7a87c83d3ccc
* | | | | Updates to generate_ml_bundle.Mathew Inwood2021-04-281-26/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update for new stubs location - Add -p option to set prefer=true - Add -a option to also update artifacts Test: ./packages/modules/common/generate_ml_bundle.sh $(pwd) $(pwd) 30 Bug: 180769414 Change-Id: I0dc2a788c091d27ff2b76b14b09b626d85154434
* | | | | [automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: ↵satayev2021-04-230-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3db6cbd5f -s ours am: 0284577be2 -s ours am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310 Change-Id: Ibff61817e544988ce5013896059b37d2772286fa
| * | | | [automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: ↵satayev2021-04-230-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3db6cbd5f -s ours am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310 Change-Id: Id28740762d51889fc1fe61366725513c72df6884
* | | | | [automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ours am: ↵satayev2021-04-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21651b0046 -s ours am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228 Change-Id: Ieed216cfcb6ca29a8ec5b64e1d60ffd2c74906fc
| * | | | [automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ourssatayev2021-04-230-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 fc3f50920c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228 Change-Id: I3b7dde56a56909f12357d15a6ab517e922e44676
* | | | | | [automerger skipped] Re-generated allow-deps.txt. am: fc3f50920c -s ourssatayev2021-04-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: skipped by user satayev Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14293721 Change-Id: Ic19171dd4a0404ca26e3508102925e9ef39a8c07
| * | | | | Re-generated allow-deps.txt.satayev2021-04-231-157/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a merged version of aosp, mainline-prod, and internal versions. Make sure that the build passes on all three branches. Nothing was manually removed. Bug: 185209711 Test: run packages/modules/common/build/update-apex-allowed-deps.sh Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82 Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
* | | | | | [automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: ↵satayev2021-04-230-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3db6cbd5f -s ours am: abae854c55 -s ours am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310 Change-Id: I4760ac0da21fbe5e9a5fb3150b925b89cbe26d7a
| * | | | | [automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ours am: ↵satayev2021-04-230-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3db6cbd5f -s ours am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310 Change-Id: Ic1e5b93c3e66c68690e3827bf3ebb64ff72061fc
| | * | | | [automerger skipped] Re-generated allow-deps.txt. am: 9b8f9236a9 -s ourssatayev2021-04-230-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | | | | | | | | | | | | | | | am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 38fc61bbf0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1673310 Change-Id: I2fea18e13d225768ca41cf9592b17eff8c21980f
| | | * | Re-generated allow-deps.txt.satayev2021-04-231-158/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a merged version of aosp, mainline-prod, and internal versions. Make sure that the build passes on all three branches. Nothing was manually removed. Bug: 185209711 Test: run packages/modules/common/build/update-apex-allowed-deps.sh Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82 Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82 Merged-In: I09d28383d61fa6e08fc6e20b3ce5c7ff77cf56a6
* | | | | [automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ours am: ↵satayev2021-04-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f528a3f27c -s ours am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 ad750e09ed is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228 Change-Id: I455160490e81e24dc1f999d7e5ec7d7dd3824376
| * | | | [automerger skipped] Re-generated allow-deps.txt. am: 38fc61bbf0 -s ourssatayev2021-04-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: skip tag Change-Id Ide5041ac6bf558cf6305f528a74b8d5a83251d82 with SHA-1 ad750e09ed is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/14296228 Change-Id: I14506321ed8624cb771c6bcfe829cc1d5396f856
| | * | | Re-generated allow-deps.txt.satayev2021-04-231-157/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a merged version of aosp, mainline-prod, and internal versions. Make sure that the build passes on all three branches. Nothing was manually removed. Bug: 185209711 Test: run packages/modules/common/build/update-apex-allowed-deps.sh Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82 Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82 Merged-In: I09d28383d61fa6e08fc6e20b3ce5c7ff77cf56a6
* | | | | resolve merge conflicts of ad750e09ed0bd6698842212208d08908b8b281fa to sc-devsatayev2021-04-231-182/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: run packages/modules/common/build/update-apex-allowed-deps.sh Bug: 185209711 Change-Id: I09d28383d61fa6e08fc6e20b3ce5c7ff77cf56a6 Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
| * | | | Re-generated allow-deps.txt.satayev2021-04-231-113/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a merged version of aosp, mainline-prod, and internal versions. Make sure that the build passes on all three branches. Nothing was manually removed. Bug: 185209711 Test: run packages/modules/common/build/update-apex-allowed-deps.sh Change-Id: Ide5041ac6bf558cf6305f528a74b8d5a83251d82 Merged-In: Ide5041ac6bf558cf6305f528a74b8d5a83251d82
* | | | | Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: ↵Anton Hansson2021-04-230-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 38a15eefdb am: 4a7755e08a Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881 Change-Id: Ie566238c6343d34925c6aa392b936f2327dd51bf
| * | | | Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: ↵Anton Hansson2021-04-232-1/+65
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 38a15eefdb Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881 Change-Id: I1c8a25bb65b1a1fd63dd07b21619e97d6dc82c24
* | | | | Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: ↵Anton Hansson2021-04-232-1/+65
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 38a15eefdb am: b3811ba5a8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881 Change-Id: Ia614567d4cb0b036c9c908409160b7cd9213fbc2
| * | | | Merge "Add build rules for updated SDK 30 android.jars" am: 57097d42c1 am: ↵Anton Hansson2021-04-232-1/+65
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 38a15eefdb Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1675881 Change-Id: I047adf65e2cfb01288829e1b64297f671abb9a7d