Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: Idc432653c373df9c244399cceb29509245123f89
Change-Id: Ia1cb202ec5dedbf85d1327d461186913b1a3003f
diff --git a/Android.bp b/Android.bp
index 44eff1f..463c5e2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -113,6 +113,9 @@
"--extra-packages",
"com.android.tv.common",
],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
prebuilt_etc {
diff --git a/common/Android.bp b/common/Android.bp
index f6ba940..acc614a 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -41,18 +41,18 @@
],
static_libs: [
- "androidx.legacy_legacy-support-core-ui",
- "androidx.appcompat_appcompat",
- "androidx.preference_preference",
- "androidx.leanback_leanback",
- "androidx.tvprovider_tvprovider",
- "tv-guava-android-jar",
- "tv-guava-failureaccess-jar",
- "jsr330",
- "tv-lib-dagger",
- "tv-lib-exoplayer",
- "tv-lib-exoplayer-v2-core",
- "tv-lib-dagger-android",
+ "androidx.legacy_legacy-support-core-ui",
+ "androidx.appcompat_appcompat",
+ "androidx.preference_preference",
+ "androidx.leanback_leanback",
+ "androidx.tvprovider_tvprovider",
+ "tv-guava-android-jar",
+ "tv-guava-failureaccess-jar",
+ "jsr330",
+ "tv-lib-dagger",
+ "tv-lib-exoplayer",
+ "tv-lib-exoplayer-v2-core",
+ "tv-lib-dagger-android",
],
plugins: [
@@ -62,8 +62,10 @@
"tv-lib-dagger-compiler",
],
-
min_sdk_version: "23",
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
// TODO(b/77284273): generate build config after dagger supports libraries
//include $(LOCAL_PATH)/buildconfig.mk
diff --git a/common/tests/robotests/Android.bp b/common/tests/robotests/Android.bp
index babaf7d..4ce4e3d 100644
--- a/common/tests/robotests/Android.bp
+++ b/common/tests/robotests/Android.bp
@@ -28,9 +28,6 @@
],
java_resource_dirs: ["config"],
libs: [
- "robolectric_android-all-stub",
- "Robolectric_all-target",
- "mockito-robolectric-prebuilt",
"diffutils-prebuilt-jar",
],
static_libs: [
@@ -47,4 +44,5 @@
test_options: {
timeout: 36000,
},
+ upstream: true,
}
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index f1f1526..ae00673 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -35,7 +35,7 @@
"mockito-robolectric-prebuilt",
"tv-lib-truth",
"androidx.test.uiautomator_uiautomator",
- "Robolectric_all-target",
+ "Robolectric_all-target_upstream",
],
// Link tv-common as shared library to avoid the problem of initialization of the constants
@@ -60,8 +60,7 @@
"src/com/android/tv/testing/shadows/**/*.java",
],
static_libs: [
- "robolectric_android-all-stub",
- "Robolectric_all-target",
+ "Robolectric_all-target_upstream",
"mockito-robolectric-prebuilt",
"tv-test-common",
],
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index a89f38f..02015be 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -30,11 +30,6 @@
"src/com/android/tv/data/epg/EpgFetcherImplTest.java",
"src/com/android/tv/guide/ProgramItemViewTest.java",
],
- libs: [
- "Robolectric_all-target",
- "mockito-robolectric-prebuilt",
- "robolectric_android-all-stub",
- ],
static_libs: [
"tv-lib-dagger",
"tv-lib-truth",
@@ -54,4 +49,5 @@
test_options: {
timeout: 36000,
},
+ upstream: true,
}
diff --git a/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java b/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
index 93813c0..d1c16a8 100644
--- a/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
@@ -44,7 +44,6 @@
* We are going to create our own custom manifest so that we can add multiple resource paths to
* it. This lets us access resources in both Settings and SettingsLib in our tests.
*/
- @Override
protected AndroidManifest getAppManifest(Config config) {
final String packageName = "com.android.tv";
diff --git a/tuner/Android.bp b/tuner/Android.bp
index d094c45..81ae2ed 100644
--- a/tuner/Android.bp
+++ b/tuner/Android.bp
@@ -52,4 +52,7 @@
"tv-lib-dagger-compiler",
],
min_sdk_version: "23",
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
diff --git a/tuner/tests/robotests/Android.bp b/tuner/tests/robotests/Android.bp
index 99926e7..a1baf65 100644
--- a/tuner/tests/robotests/Android.bp
+++ b/tuner/tests/robotests/Android.bp
@@ -27,11 +27,6 @@
"javatests/**/*.java",
],
java_resource_dirs: ["config"],
- libs: [
- "robolectric_android-all-stub",
- "Robolectric_all-target",
- "mockito-robolectric-prebuilt",
- ],
static_libs: [
"tv-lib-dagger",
"androidx.test.core",
@@ -48,4 +43,5 @@
test_options: {
timeout: 36000,
},
+ upstream: true,
}
diff --git a/tuner/tests/robotests/javatests/com/android/tv/tuner/testing/TvTunerRobolectricTestRunner.java b/tuner/tests/robotests/javatests/com/android/tv/tuner/testing/TvTunerRobolectricTestRunner.java
index 89b7510..ab0955e 100644
--- a/tuner/tests/robotests/javatests/com/android/tv/tuner/testing/TvTunerRobolectricTestRunner.java
+++ b/tuner/tests/robotests/javatests/com/android/tv/tuner/testing/TvTunerRobolectricTestRunner.java
@@ -44,7 +44,6 @@
* We are going to create our own custom manifest so that we can add multiple resource paths to
* it.
*/
- @Override
protected AndroidManifest getAppManifest(Config config) {
final String packageName = "com.android.tv.tuner";
