From c17db96478ad95a6f4356143239f621c09696a55 Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Mon, 17 May 2021 16:29:02 +0200 Subject: [PATCH] Move chimera content to com.google --- .../android/gms/dynamite/IDynamiteLoader.aidl | 2 +- .../android/gms/chimera/container/DynamiteContext.java | 2 +- .../android/gms/chimera/container/DynamiteLoaderImpl.java | 4 ++-- .../android/gms/chimera/container/DynamiteModuleInfo.java | 2 +- .../android/gms/chimera/container/FilteredClassLoader.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename play-services-api/src/main/aidl/com/{mgoogle => google}/android/gms/dynamite/IDynamiteLoader.aidl (94%) rename play-services-core/src/main/java/com/{mgoogle => google}/android/gms/chimera/container/DynamiteContext.java (98%) rename play-services-core/src/main/java/com/{mgoogle => google}/android/gms/chimera/container/DynamiteLoaderImpl.java (97%) rename play-services-core/src/main/java/com/{mgoogle => google}/android/gms/chimera/container/DynamiteModuleInfo.java (96%) rename play-services-core/src/main/java/com/{mgoogle => google}/android/gms/chimera/container/FilteredClassLoader.java (97%) diff --git a/play-services-api/src/main/aidl/com/mgoogle/android/gms/dynamite/IDynamiteLoader.aidl b/play-services-api/src/main/aidl/com/google/android/gms/dynamite/IDynamiteLoader.aidl similarity index 94% rename from play-services-api/src/main/aidl/com/mgoogle/android/gms/dynamite/IDynamiteLoader.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/dynamite/IDynamiteLoader.aidl index 2826205e..017a2dc2 100644 --- a/play-services-api/src/main/aidl/com/mgoogle/android/gms/dynamite/IDynamiteLoader.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/dynamite/IDynamiteLoader.aidl @@ -1,4 +1,4 @@ -package com.mgoogle.android.gms.dynamite; +package com.google.android.gms.dynamite; import com.google.android.gms.dynamic.IObjectWrapper; diff --git a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteContext.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteContext.java similarity index 98% rename from play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteContext.java rename to play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteContext.java index 78d484be..7f104fbe 100644 --- a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteContext.java +++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteContext.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.mgoogle.android.gms.chimera.container; +package com.google.android.gms.chimera.container; import android.content.Context; import android.content.ContextWrapper; diff --git a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteLoaderImpl.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java similarity index 97% rename from play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteLoaderImpl.java rename to play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java index 71ded1cb..48e5a4b5 100644 --- a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteLoaderImpl.java +++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mgoogle.android.gms.chimera.container; +package com.google.android.gms.chimera.container; import android.content.Context; import android.content.ContextWrapper; @@ -24,7 +24,7 @@ import android.util.Log; import com.google.android.gms.dynamic.IObjectWrapper; import com.google.android.gms.dynamic.ObjectWrapper; -import com.mgoogle.android.gms.dynamite.IDynamiteLoader; +import com.google.android.gms.dynamite.IDynamiteLoader; import org.microg.gms.common.Constants; diff --git a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteModuleInfo.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteModuleInfo.java similarity index 96% rename from play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteModuleInfo.java rename to play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteModuleInfo.java index 5d952172..637a269f 100644 --- a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/DynamiteModuleInfo.java +++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteModuleInfo.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.mgoogle.android.gms.chimera.container; +package com.google.android.gms.chimera.container; import java.util.Collection; import java.util.Collections; diff --git a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/FilteredClassLoader.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/FilteredClassLoader.java similarity index 97% rename from play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/FilteredClassLoader.java rename to play-services-core/src/main/java/com/google/android/gms/chimera/container/FilteredClassLoader.java index 1d3e97bc..76731fc3 100644 --- a/play-services-core/src/main/java/com/mgoogle/android/gms/chimera/container/FilteredClassLoader.java +++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/FilteredClassLoader.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package com.mgoogle.android.gms.chimera.container; +package com.google.android.gms.chimera.container; import android.util.Log;