summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2019-08-01 16:30:40 +0100
committerTobias Thierer <tobiast@google.com>2019-08-01 16:34:00 +0100
commitb736fceead1060daf1bbc8ca8f950d8789aeacd5 (patch)
tree1fa25f8fa5cac852883f179b1f8ce41863bfd603 /annotations/generate_annotated_java_files.py
parent79eea269ce9db7740ed6fce44c475b2eaf5b1bdf (diff)
Use external/mime-support's mime.types rather than libcore's copy.
Libcore was carrying a copy of mime.types that is now also present in external/mime-support, and exposed through a filegroup in another CL in this CL topic. Because external/mime-support's filegroup carries the file in the root level rather than in the libcore/net/ subdirectory, this CL updates MimeMap.java accordingly. libcore's mime.types and the associated README are now redundant, so this CL drops them. Bug: 135431432 Test: Checked that libcore's and external/mime-support's mime.types were exactly identical before this CL: diff {libcore/luni/src/main/java/libcore/net,external/mime-support}/mime.types Test: atest CtsLibcoreTestCases:libcore.libcore.net.MimeMapTest Change-Id: I632d2977f6588d92177cf059d3c048e07c38f341
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions