Move phenotype in own module

play-services-api/build.gradle

@@ -40,4 +40,5 @@ android {
 
 dependencies {
     api project(':play-services-base')
+    api project(':play-services-phenotype')
 }

play-services-clearcut/build.gradle

@@ -34,12 +34,10 @@ apply from: '../gradle/publish-android.gradle'
 description = 'microG implementation of play-services-clearcut'
 
 dependencies {
-    implementation project(':play-services-api')
-
     // Dependencies from play-services-clearcut:17.0.0
     api "androidx.core:core:1.0.0"
     api project(':play-services-base')
     api project(':play-services-basement')
-//    api project(':play-services-phenotype')
+    api project(':play-services-phenotype')
     api project(':play-services-tasks')
 }

play-services-phenotype/build.gradle

@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: 2023 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+dependencies {
+    // Dependencies from play-services-phenotype:17.0.0
+    api "androidx.core:core:1.0.0"
+    api project(':play-services-base')
+    api project(':play-services-basement')
+    api project(':play-services-tasks')
+
+    annotationProcessor project(':safe-parcel-processor')
+}
+
+android {
+    namespace "com.google.android.gms.phenotype"
+
+    compileSdkVersion androidCompileSdk
+    buildToolsVersion "$androidBuildVersionTools"
+
+    buildFeatures {
+        aidl = true
+    }
+
+    defaultConfig {
+        versionName version
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSdk
+    }
+
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+}
+
+apply from: '../gradle/publish-android.gradle'
+
+description = 'microG implementation of play-services-phenotype'

play-services-phenotype/src/main/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2023 microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application />
+</manifest>

play-services-api/src/main/java/com/google/android/gms/phenotype/Configuration.java → play-services-phenotype/src/main/java/com/google/android/gms/phenotype/Configuration.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2020 microG Project Team
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -14,5 +14,6 @@ public class Configuration extends AutoSafeParcelable {
     public Flag[] flags;
     @Field(4)
     public String[] removeNames;
-    public static final Creator<Configuration> CREATOR = new AutoCreator<>(Configuration.class);
+
+    public static final Creator<Configuration> CREATOR = findCreator(Configuration.class);
 }

play-services-api/src/main/java/com/google/android/gms/phenotype/ExperimentTokens.java → play-services-phenotype/src/main/java/com/google/android/gms/phenotype/ExperimentTokens.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2020 microG Project Team
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -26,5 +26,6 @@ public class ExperimentTokens extends AutoSafeParcelable {
     public byte[][] directs;
     @Field(10)
     public int[] genericDimensions;
-    public static final Creator<ExperimentTokens> CREATOR = new AutoCreator<>(ExperimentTokens.class);
+
+    public static final Creator<ExperimentTokens> CREATOR = findCreator(ExperimentTokens.class);
 }

play-services-api/src/main/java/com/google/android/gms/phenotype/Flag.java → play-services-phenotype/src/main/java/com/google/android/gms/phenotype/Flag.java

@@ -1,12 +1,14 @@
 /*
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2020 microG Project Team
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.google.android.gms.phenotype;
 
+import org.microg.gms.common.Hide;
 import org.microg.safeparcel.AutoSafeParcelable;
 
+@Hide
 public class Flag extends AutoSafeParcelable {
     @Field(2)
     public String name;
@@ -98,5 +100,6 @@ public byte[] getBytes() {
     public static final int DATA_TYPE_DOUBLE = 3;
     public static final int DATA_TYPE_STRING = 4;
     public static final int DATA_TYPE_BYTES = 5;
-    public static final Creator<Flag> CREATOR = new AutoCreator<>(Flag.class);
+
+    public static final Creator<Flag> CREATOR = findCreator(Flag.class);
 }

play-services-api/src/main/java/com/google/android/gms/phenotype/GenericDimension.java → play-services-phenotype/src/main/java/com/google/android/gms/phenotype/GenericDimension.java

@@ -1,17 +1,19 @@
 /*
- * SPDX-FileCopyrightText: 2020, microG Project Team
+ * SPDX-FileCopyrightText: 2020 microG Project Team
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.google.android.gms.phenotype;
 
+import org.microg.gms.common.Hide;
 import org.microg.safeparcel.AutoSafeParcelable;
 
+@Hide
 public class GenericDimension extends AutoSafeParcelable {
     @Field(1)
     public int a;
     @Field(2)
     public int b;
 
-    public static final Creator<GenericDimension> CREATOR = new AutoCreator<>(GenericDimension.class);
+    public static final Creator<GenericDimension> CREATOR = findCreator(GenericDimension.class);
 }

play-services-vision-common/build.gradle

@@ -37,7 +37,7 @@ dependencies {
     // Dependencies from play-services-vision-common:19.1.3
     api project(':play-services-base')
     api project(':play-services-basement')
-    //api project(':play-services-clearcut')
+    api project(':play-services-clearcut')
     //api project(':play-services-flags')
-    //api project(':play-services-phenotype')
+    api project(':play-services-phenotype')
 }

settings.gradle

@@ -31,6 +31,7 @@ include ':play-services-measurement-base'
 include ':play-services-nearby'
 include ':play-services-oss-licenses'
 include ':play-services-pay'
+include ':play-services-phenotype'
 include ':play-services-places'
 include ':play-services-places-placereport'
 include ':play-services-recaptcha'