summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartynas Petuška <petuska@google.com>2023-11-20 06:48:20 -0800
committerCopybara Service <copybara-worker@google.com>2023-11-23 17:02:57 +0000
commit6c3264f68aa3ae2f7df693a299db761fcd8e100c (patch)
tree7a77c1e3de0cbfa1f852701a5842a8670c241b5c
parent21e9a95cb5eb49ad3da7f1c0152467737697447f (diff)
downloadandroid_onboarding-6c3264f68aa3ae2f7df693a299db761fcd8e100c.tar.gz
Copybara ❤️: Export dager and hilt flag modules
CL: cl/584012825 Bug: 301578742 PiperOrigin-RevId: 584012825 Change-Id: I987c93c923c55ecfd31ee338e0bf81596c41ffd5
-rw-r--r--src/com/android/onboarding/contracts/annotations/Android.bp2
-rw-r--r--src/com/android/onboarding/contracts/annotations/InternalOnboardingApi.kt3
-rw-r--r--src/com/android/onboarding/flags/Android.bp27
-rw-r--r--src/com/android/onboarding/flags/OnboardingFlagsPommelModule.kt16
-rw-r--r--src/com/android/onboarding/flags/testing/Android.bp29
5 files changed, 61 insertions, 16 deletions
diff --git a/src/com/android/onboarding/contracts/annotations/Android.bp b/src/com/android/onboarding/contracts/annotations/Android.bp
index efb5c2c..e68430f 100644
--- a/src/com/android/onboarding/contracts/annotations/Android.bp
+++ b/src/com/android/onboarding/contracts/annotations/Android.bp
@@ -8,6 +8,7 @@ java_library {
"*.kt",
],
static_libs: [
+ "androidx.annotation_annotation",
],
}
@@ -18,5 +19,6 @@ java_library_host {
"*.kt",
],
static_libs: [
+ "androidx.annotation_annotation",
],
}
diff --git a/src/com/android/onboarding/contracts/annotations/InternalOnboardingApi.kt b/src/com/android/onboarding/contracts/annotations/InternalOnboardingApi.kt
index 0e70dc7..0e33c38 100644
--- a/src/com/android/onboarding/contracts/annotations/InternalOnboardingApi.kt
+++ b/src/com/android/onboarding/contracts/annotations/InternalOnboardingApi.kt
@@ -1,7 +1,10 @@
package com.android.onboarding.contracts.annotations
+import androidx.annotation.Keep
+
@RequiresOptIn(
message = "Marked entity is meant for internal use by the onboarding framework",
level = RequiresOptIn.Level.ERROR,
)
+@Keep
annotation class InternalOnboardingApi
diff --git a/src/com/android/onboarding/flags/Android.bp b/src/com/android/onboarding/flags/Android.bp
index d6876ed..525620d 100644
--- a/src/com/android/onboarding/flags/Android.bp
+++ b/src/com/android/onboarding/flags/Android.bp
@@ -13,3 +13,30 @@ android_library {
static_libs: [
],
}
+
+android_library {
+ name: "android_onboarding.flags_dagger",
+ manifest: ":android_onboarding.AndroidManifest",
+ srcs: [
+ "OnboardingFlagsModule.kt",
+ ],
+ dont_merge_manifests: true,
+ static_libs: [
+ "android_onboarding.flags",
+ "dagger2",
+ ],
+}
+
+android_library {
+ name: "android_onboarding.flags_hilt",
+ manifest: ":android_onboarding.AndroidManifest",
+ srcs: [
+ "OnboardingFlagsHiltModule.kt",
+ ],
+ dont_merge_manifests: true,
+ static_libs: [
+ "android_onboarding.flags",
+ "dagger2",
+ "hilt_android",
+ ],
+}
diff --git a/src/com/android/onboarding/flags/OnboardingFlagsPommelModule.kt b/src/com/android/onboarding/flags/OnboardingFlagsPommelModule.kt
deleted file mode 100644
index 4236ad7..0000000
--- a/src/com/android/onboarding/flags/OnboardingFlagsPommelModule.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.android.onboarding.flags
-
-import com.google.android.gms.pommel.InstallIn
-import com.google.android.gms.pommel.components.GmsModuleComponent
-import dagger.Module
-import dagger.Provides
-import dagger.Reusable
-
-@Module
-@InstallIn(GmsModuleComponent::class)
-object OnboardingFlagsPommelModule {
-
- @Provides
- @Reusable
- fun provideOnboardingFlagsProvider(): OnboardingFlagsProvider = DefaultOnboardingFlagsProvider()
-}
diff --git a/src/com/android/onboarding/flags/testing/Android.bp b/src/com/android/onboarding/flags/testing/Android.bp
index c7ef05f..8a6f045 100644
--- a/src/com/android/onboarding/flags/testing/Android.bp
+++ b/src/com/android/onboarding/flags/testing/Android.bp
@@ -13,3 +13,32 @@ android_library {
"android_onboarding.flags",
],
}
+
+android_library {
+ name: "android_onboarding.flags.testing_dagger",
+ manifest: ":android_onboarding.AndroidManifest",
+ srcs: [
+ "TestingDaggerModule.kt",
+ ],
+ dont_merge_manifests: true,
+ static_libs: [
+ "android_onboarding.flags.testing",
+ "jsr330",
+ "dagger2",
+ ],
+}
+
+
+android_library {
+ name: "android_onboarding.flags.testing_hilt",
+ manifest: ":android_onboarding.AndroidManifest",
+ srcs: [
+ "TestingHiltModule.kt",
+ ],
+ dont_merge_manifests: true,
+ static_libs: [
+ "android_onboarding.flags.testing_dagger",
+ "dagger2",
+ "hilt_android",
+ ],
+}