summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Mitch Phillips <mitchp@google.com> 2023-06-26 08:08:56 +0000
committer Mitch Phillips <mitchp@google.com> 2023-06-26 11:37:19 +0000
commit9036f731d0206fc81b1f99ba298b8f2115f14083 (patch)
tree75909f414252f55b97c62c10114b628df5a1beb5 /java/java.go
parent10cd5f9e4d5a038cd903317799045a9333dc0289 (diff)
Merge "[MTE] Add memtag_globals as a sanitizer target." am: 03d510404c am: f0a50d44f2 am: e0dc3cad79
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2625692 Bug: b/288828741 1. There was a topic that contained this build system glue, and a dependent change in external/cronet. 2. external/cronet is setup to automerge into udc-mainline-prod from aosp. 3. The build system isn't. 4. Boom because of the missing dependency. The build system glue should be low-risk, and I'd like to unbrick the build, and so merging this here on the desires of the cronet team. Follow ups to come in that bug. Change-Id: Ia92251cfaa3af5e3136eb28570c82c04101fb9d9 Merged-In: Ie7882d474d4d776232de3a3d571a82274df14bf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> (cherry picked from commit 69501ae617a86faa66358e32b72e83dba07be453)
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions