Move implementation of metadata API to own package
Change-Id: Ibd465b71d9a9786fe808c51e2b9fecbc9b9625f0
diff --git a/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java b/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
index afe61c8..25a5031 100644
--- a/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
+++ b/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
@@ -48,7 +48,7 @@
import com.android.tools.r8.graph.InnerClassAttribute;
import com.android.tools.r8.graph.ObjectToOffsetMapping;
import com.android.tools.r8.graph.ParameterAnnotationsList;
-import com.android.tools.r8.metadata.BuildMetadataFactory;
+import com.android.tools.r8.metadata.impl.BuildMetadataFactory;
import com.android.tools.r8.naming.KotlinModuleSynthesizer;
import com.android.tools.r8.naming.NamingLens;
import com.android.tools.r8.naming.ProguardMapSupplier.ProguardMapId;
diff --git a/src/main/java/com/android/tools/r8/metadata/D8BuildMetadata.java b/src/main/java/com/android/tools/r8/metadata/D8BuildMetadata.java
index eed136e..765c05c 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8BuildMetadata.java
+++ b/src/main/java/com/android/tools/r8/metadata/D8BuildMetadata.java
@@ -4,6 +4,10 @@
package com.android.tools.r8.metadata;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
+import com.android.tools.r8.metadata.impl.D8ApiModelingOptionsImpl;
+import com.android.tools.r8.metadata.impl.D8BuildMetadataImpl;
+import com.android.tools.r8.metadata.impl.D8LibraryDesugaringOptionsImpl;
+import com.android.tools.r8.metadata.impl.D8OptionsImpl;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializer;
diff --git a/src/main/java/com/android/tools/r8/metadata/D8LibraryDesugaringOptions.java b/src/main/java/com/android/tools/r8/metadata/D8LibraryDesugaringOptions.java
index 893be57..30adb4a 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8LibraryDesugaringOptions.java
+++ b/src/main/java/com/android/tools/r8/metadata/D8LibraryDesugaringOptions.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.metadata;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
+import com.android.tools.r8.metadata.impl.D8R8LibraryDesugaringOptions;
@KeepForApi
public interface D8LibraryDesugaringOptions extends D8R8LibraryDesugaringOptions {}
diff --git a/src/main/java/com/android/tools/r8/metadata/D8Options.java b/src/main/java/com/android/tools/r8/metadata/D8Options.java
index c7bd25c..b09f4b4 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8Options.java
+++ b/src/main/java/com/android/tools/r8/metadata/D8Options.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.metadata;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
+import com.android.tools.r8.metadata.impl.D8R8Options;
@KeepForApi
public interface D8Options extends D8R8Options<D8ApiModelingOptions, D8LibraryDesugaringOptions> {}
diff --git a/src/main/java/com/android/tools/r8/metadata/R8BuildMetadata.java b/src/main/java/com/android/tools/r8/metadata/R8BuildMetadata.java
index 450f537..0057ddc 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8BuildMetadata.java
+++ b/src/main/java/com/android/tools/r8/metadata/R8BuildMetadata.java
@@ -4,6 +4,14 @@
package com.android.tools.r8.metadata;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
+import com.android.tools.r8.metadata.impl.R8ApiModelingOptionsImpl;
+import com.android.tools.r8.metadata.impl.R8BaselineProfileRewritingOptionsImpl;
+import com.android.tools.r8.metadata.impl.R8BuildMetadataImpl;
+import com.android.tools.r8.metadata.impl.R8KeepAttributesOptionsImpl;
+import com.android.tools.r8.metadata.impl.R8LibraryDesugaringOptionsImpl;
+import com.android.tools.r8.metadata.impl.R8OptionsImpl;
+import com.android.tools.r8.metadata.impl.R8ResourceOptimizationOptionsImpl;
+import com.android.tools.r8.metadata.impl.R8StartupOptimizationOptionsImpl;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializer;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8LibraryDesugaringOptions.java b/src/main/java/com/android/tools/r8/metadata/R8LibraryDesugaringOptions.java
index 5549ac8..6a9df33 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8LibraryDesugaringOptions.java
+++ b/src/main/java/com/android/tools/r8/metadata/R8LibraryDesugaringOptions.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.metadata;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
+import com.android.tools.r8.metadata.impl.D8R8LibraryDesugaringOptions;
@KeepForApi
public interface R8LibraryDesugaringOptions extends D8R8LibraryDesugaringOptions {}
diff --git a/src/main/java/com/android/tools/r8/metadata/BuildMetadataFactory.java b/src/main/java/com/android/tools/r8/metadata/impl/BuildMetadataFactory.java
similarity index 90%
rename from src/main/java/com/android/tools/r8/metadata/BuildMetadataFactory.java
rename to src/main/java/com/android/tools/r8/metadata/impl/BuildMetadataFactory.java
index c8ae112..ef67f53 100644
--- a/src/main/java/com/android/tools/r8/metadata/BuildMetadataFactory.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/BuildMetadataFactory.java
@@ -1,13 +1,15 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.Version;
import com.android.tools.r8.dex.VirtualFile;
import com.android.tools.r8.graph.AppInfo;
import com.android.tools.r8.graph.AppInfoWithClassHierarchy;
import com.android.tools.r8.graph.AppView;
+import com.android.tools.r8.metadata.D8BuildMetadata;
+import com.android.tools.r8.metadata.R8BuildMetadata;
import com.android.tools.r8.utils.InternalOptions;
import java.util.List;
diff --git a/src/main/java/com/android/tools/r8/metadata/D8ApiModelingOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/D8ApiModelingOptionsImpl.java
similarity index 92%
rename from src/main/java/com/android/tools/r8/metadata/D8ApiModelingOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/D8ApiModelingOptionsImpl.java
index 58f9f56..64a6302 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8ApiModelingOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/D8ApiModelingOptionsImpl.java
@@ -1,13 +1,14 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.D8ApiModelingOptions;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/D8BuildMetadataImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/D8BuildMetadataImpl.java
similarity index 93%
rename from src/main/java/com/android/tools/r8/metadata/D8BuildMetadataImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/D8BuildMetadataImpl.java
index 532027e..9f4bd36 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8BuildMetadataImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/D8BuildMetadataImpl.java
@@ -1,14 +1,15 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
-import com.android.tools.r8.metadata.R8BuildMetadataImpl.Builder;
+import com.android.tools.r8.metadata.D8BuildMetadata;
+import com.android.tools.r8.metadata.D8Options;
import com.google.gson.Gson;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/D8LibraryDesugaringOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/D8LibraryDesugaringOptionsImpl.java
similarity index 92%
rename from src/main/java/com/android/tools/r8/metadata/D8LibraryDesugaringOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/D8LibraryDesugaringOptionsImpl.java
index 1d87662..0571af6 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8LibraryDesugaringOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/D8LibraryDesugaringOptionsImpl.java
@@ -1,13 +1,14 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.D8LibraryDesugaringOptions;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/D8OptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/D8OptionsImpl.java
similarity index 85%
rename from src/main/java/com/android/tools/r8/metadata/D8OptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/D8OptionsImpl.java
index 021b9ba..39210bd 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8OptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/D8OptionsImpl.java
@@ -1,13 +1,16 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.D8ApiModelingOptions;
+import com.android.tools.r8.metadata.D8LibraryDesugaringOptions;
+import com.android.tools.r8.metadata.D8Options;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/D8R8LibraryDesugaringOptions.java b/src/main/java/com/android/tools/r8/metadata/impl/D8R8LibraryDesugaringOptions.java
similarity index 86%
rename from src/main/java/com/android/tools/r8/metadata/D8R8LibraryDesugaringOptions.java
rename to src/main/java/com/android/tools/r8/metadata/impl/D8R8LibraryDesugaringOptions.java
index 9679857..8ea55df 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8R8LibraryDesugaringOptions.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/D8R8LibraryDesugaringOptions.java
@@ -1,7 +1,7 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
public interface D8R8LibraryDesugaringOptions {
diff --git a/src/main/java/com/android/tools/r8/metadata/D8R8LibraryDesugaringOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/D8R8LibraryDesugaringOptionsImpl.java
similarity index 96%
rename from src/main/java/com/android/tools/r8/metadata/D8R8LibraryDesugaringOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/D8R8LibraryDesugaringOptionsImpl.java
index 92cd481..8cc4c8b 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8R8LibraryDesugaringOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/D8R8LibraryDesugaringOptionsImpl.java
@@ -1,7 +1,7 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
diff --git a/src/main/java/com/android/tools/r8/metadata/D8R8Options.java b/src/main/java/com/android/tools/r8/metadata/impl/D8R8Options.java
similarity index 93%
rename from src/main/java/com/android/tools/r8/metadata/D8R8Options.java
rename to src/main/java/com/android/tools/r8/metadata/impl/D8R8Options.java
index 07b4844..6b7f8fc 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8R8Options.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/D8R8Options.java
@@ -1,7 +1,7 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
public interface D8R8Options<
ApiModelingOptions, LibraryDesugaringOptions extends D8R8LibraryDesugaringOptions> {
diff --git a/src/main/java/com/android/tools/r8/metadata/D8R8OptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/D8R8OptionsImpl.java
similarity index 97%
rename from src/main/java/com/android/tools/r8/metadata/D8R8OptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/D8R8OptionsImpl.java
index 0e4801a..8402dd9 100644
--- a/src/main/java/com/android/tools/r8/metadata/D8R8OptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/D8R8OptionsImpl.java
@@ -1,7 +1,7 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8ApiModelingOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/R8ApiModelingOptionsImpl.java
similarity index 92%
rename from src/main/java/com/android/tools/r8/metadata/R8ApiModelingOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/R8ApiModelingOptionsImpl.java
index 33be1b4..c1ed920 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8ApiModelingOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/R8ApiModelingOptionsImpl.java
@@ -1,13 +1,14 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.R8ApiModelingOptions;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8BaselineProfileRewritingOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/R8BaselineProfileRewritingOptionsImpl.java
similarity index 92%
rename from src/main/java/com/android/tools/r8/metadata/R8BaselineProfileRewritingOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/R8BaselineProfileRewritingOptionsImpl.java
index 4de58a5..36b7683 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8BaselineProfileRewritingOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/R8BaselineProfileRewritingOptionsImpl.java
@@ -1,13 +1,14 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.R8BaselineProfileRewritingOptions;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8BuildMetadataImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/R8BuildMetadataImpl.java
similarity index 92%
rename from src/main/java/com/android/tools/r8/metadata/R8BuildMetadataImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/R8BuildMetadataImpl.java
index d59db11..8edb511 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8BuildMetadataImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/R8BuildMetadataImpl.java
@@ -1,13 +1,18 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.R8BaselineProfileRewritingOptions;
+import com.android.tools.r8.metadata.R8BuildMetadata;
+import com.android.tools.r8.metadata.R8Options;
+import com.android.tools.r8.metadata.R8ResourceOptimizationOptions;
+import com.android.tools.r8.metadata.R8StartupOptimizationOptions;
import com.google.gson.Gson;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8KeepAttributesOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/R8KeepAttributesOptionsImpl.java
similarity index 98%
rename from src/main/java/com/android/tools/r8/metadata/R8KeepAttributesOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/R8KeepAttributesOptionsImpl.java
index 3e12905..ccec35f 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8KeepAttributesOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/R8KeepAttributesOptionsImpl.java
@@ -1,13 +1,14 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.R8KeepAttributesOptions;
import com.android.tools.r8.shaking.ProguardKeepAttributes;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8LibraryDesugaringOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/R8LibraryDesugaringOptionsImpl.java
similarity index 92%
rename from src/main/java/com/android/tools/r8/metadata/R8LibraryDesugaringOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/R8LibraryDesugaringOptionsImpl.java
index c88249e..cad11e6 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8LibraryDesugaringOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/R8LibraryDesugaringOptionsImpl.java
@@ -1,13 +1,14 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.R8LibraryDesugaringOptions;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8OptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/R8OptionsImpl.java
similarity index 91%
rename from src/main/java/com/android/tools/r8/metadata/R8OptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/R8OptionsImpl.java
index 756f637..28e5e92 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8OptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/R8OptionsImpl.java
@@ -1,13 +1,17 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
import com.android.tools.r8.keepanno.annotations.FieldAccessFlags;
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.R8ApiModelingOptions;
+import com.android.tools.r8.metadata.R8KeepAttributesOptions;
+import com.android.tools.r8.metadata.R8LibraryDesugaringOptions;
+import com.android.tools.r8.metadata.R8Options;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8ResourceOptimizationOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/R8ResourceOptimizationOptionsImpl.java
similarity index 94%
rename from src/main/java/com/android/tools/r8/metadata/R8ResourceOptimizationOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/R8ResourceOptimizationOptionsImpl.java
index c9cc341..3507271 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8ResourceOptimizationOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/R8ResourceOptimizationOptionsImpl.java
@@ -1,7 +1,7 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.ResourceShrinkerConfiguration;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
@@ -9,6 +9,7 @@
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.R8ResourceOptimizationOptions;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/com/android/tools/r8/metadata/R8StartupOptimizationOptionsImpl.java b/src/main/java/com/android/tools/r8/metadata/impl/R8StartupOptimizationOptionsImpl.java
similarity index 94%
rename from src/main/java/com/android/tools/r8/metadata/R8StartupOptimizationOptionsImpl.java
rename to src/main/java/com/android/tools/r8/metadata/impl/R8StartupOptimizationOptionsImpl.java
index 07b0a0f..0406f26 100644
--- a/src/main/java/com/android/tools/r8/metadata/R8StartupOptimizationOptionsImpl.java
+++ b/src/main/java/com/android/tools/r8/metadata/impl/R8StartupOptimizationOptionsImpl.java
@@ -1,7 +1,7 @@
// Copyright (c) 2024, the R8 project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-package com.android.tools.r8.metadata;
+package com.android.tools.r8.metadata.impl;
import com.android.tools.r8.dex.VirtualFile;
import com.android.tools.r8.keepanno.annotations.AnnotationPattern;
@@ -9,6 +9,7 @@
import com.android.tools.r8.keepanno.annotations.KeepConstraint;
import com.android.tools.r8.keepanno.annotations.KeepItemKind;
import com.android.tools.r8.keepanno.annotations.UsedByReflection;
+import com.android.tools.r8.metadata.R8StartupOptimizationOptions;
import com.android.tools.r8.utils.InternalOptions;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
