Snap for 9051867 from f3f6f103b683df8c1e0a96bbbdfe1c5603eae38c to mainline-sdkext-release
Change-Id: I607ea7ef7babeb4a6db41d4da998356676e741ee
diff --git a/Android.bp b/Android.bp
index 57771c5..2918ad1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -80,6 +80,11 @@
"guava",
"jsr330",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.adservices",
+ "com.android.ondevicepersonalization",
+ ],
sdk_version: "core_current",
}
@@ -223,6 +228,9 @@
"hilt_define_component_processor",
"hilt_generates_root_input_processor",
],
+ apex_available: [
+ "com.android.ondevicepersonalization",
+ ],
}
// Build the android hilt library. Depending on this will enable the Hilt annotation processors.
@@ -282,6 +290,9 @@
"hilt_root_processor",
"hilt_viewmodel_processor",
],
+ apex_available: [
+ "com.android.ondevicepersonalization",
+ ],
}
android_library {
diff --git a/lint-baseline.xml b/lint-baseline.xml
deleted file mode 100644
index 147f137..0000000
--- a/lint-baseline.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
-
- <issue
- id="NewApi"
- message="Multi-catch with these reflection exceptions requires API level 19 (current min is 14) because they get compiled to the common but new super type `ReflectiveOperationException`. As a workaround either create individual catch statements, or catch `Exception`."
- errorLine1=" } catch (ClassNotFoundException"
- errorLine2=" ^">
- <location
- file="external/dagger2/java/dagger/hilt/android/internal/testing/EarlySingletonComponentCreator.java"
- line="33"
- column="14"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Multi-catch with these reflection exceptions requires API level 19 (current min is 14) because they get compiled to the common but new super type `ReflectiveOperationException`. As a workaround either create individual catch statements, or catch `Exception`."
- errorLine1=" } catch (ClassNotFoundException"
- errorLine2=" ^">
- <location
- file="external/dagger2/java/dagger/hilt/android/internal/testing/TestComponentDataSupplier.java"
- line="35"
- column="14"/>
- </issue>
-
-</issues>
