Internal change

PiperOrigin-RevId: 659531569
google · Aug 5, 2024 · 43b2457 · 43b2457
1 parent c7dbf2c
commit 43b2457
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 145 deletions.
diff --git a/jdk11/src/java.base/share/classes/java/lang/VersionProps.java b/jdk11/src/java.base/share/classes/java/lang/VersionProps.java
@@ -78,11 +78,12 @@ class VersionProps {
  "";
 
  private static String VENDOR_URL_BUG =
- "http://b.corp.google.com/createIssue?component=32554";
+ "https://issuetracker.google.com/issues/new?component=317603";
+
 
  // This field is read by HotSpot
  private static String VENDOR_URL_VM_BUG =
- "http://b.corp.google.com/createIssue?component=32554";
+ "https://issuetracker.google.com/issues/new?component=317603";
 
  static {
  init();

diff --git a/...android/JarFileClassEntrySelectorNew.java → ...ld/android/JarFileClassEntrySelector.java b/...android/JarFileClassEntrySelectorNew.java → ...ld/android/JarFileClassEntrySelector.java
@@ -24,7 +24,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.devtools.java.asm.GoogleOpcodes;
+import org.objectweb.asm.Opcodes;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -306,7 +306,7 @@ private void transferClassFileJarEntry(JarEntry inEntry, InputStream in, JarOutp
  if (isGeneratedOutputEntryUnderSelection(outputEntryName)) {
  ClassWriter cw = new ClassWriter(0);
  ClassVisitor cv =
- new AnnotationFilterClassVisitor(OMITTED_ANNOTATIONS, cw, GoogleOpcodes.LATEST);
+ new AnnotationFilterClassVisitor(OMITTED_ANNOTATIONS, cw, Opcodes.ASM9);
  outputClassNode.accept(cv);
  byte[] outBytes = cw.toByteArray();
  JarEntry outJarEntry = createJarEntry(outputEntryName, outBytes);

diff --git a/tools/java/com/google/testing/apianalyzer/DesugarJdkLibsApis.java b/tools/java/com/google/testing/apianalyzer/DesugarJdkLibsApis.java