Snap for 11400057 from 0f39bd689007c69699558df3b3c88145178c393f to simpleperf-release
Change-Id: I6c6a2044eaefd5349538d559944b2aa754985304
diff --git a/Android.bp b/Android.bp
index 2465604..8ad068e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,9 +49,8 @@
resource_dirs: [
"tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/ui/src/main/res",
],
- sdk_version: "31", // Needs to be a prebuilt, so not "current".
- min_sdk_version: "16", // match with
- // tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/constants.gradle
+ sdk_version: "31", // Needs to be a prebuilt, so not "current".
+ min_sdk_version: "19", // match with tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/constants.gradle
libs: ["androidx.annotation_annotation"],
static_libs: [
"androidx.core_core",
@@ -71,6 +70,9 @@
manifest: "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/ui/src/main/AndroidManifest.xml",
jarjar_rules: "annotation-stripping-jarjar-rules.txt",
visibility: ["//packages/providers/MediaProvider:__subpackages__"],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
// Needed because exoplayer-mediaprovider-ui depends on a resource from core, using the core package
@@ -89,9 +91,8 @@
resource_dirs: [
"tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/core/src/main/res",
],
- sdk_version: "31", // Needs to be a prebuilt, so not "current".
- min_sdk_version: "16", // match with
- // tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/constants.gradle
+ sdk_version: "31", // Needs to be a prebuilt, so not "current".
+ min_sdk_version: "19", // match with tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/constants.gradle
libs: ["androidx.annotation_annotation"],
static_libs: [
"androidx.core_core",
@@ -109,9 +110,11 @@
manifest: "tree_8e57d3715f9092d5ec54ebe2e538f34bfcc34479/library/core/src/main/AndroidManifest.xml",
jarjar_rules: "annotation-stripping-jarjar-rules.txt",
visibility: ["//visibility:private"],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
-
// Used by MediaMuxerTest to test features not supported by MediaExtractor.
android_library {
name: "exoplayer-mediamuxer_tests",
@@ -127,9 +130,8 @@
resource_dirs: [
"tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/res",
],
- sdk_version: "31", // Needs to be a prebuilt, so not "current".
- min_sdk_version: "16", // match with
- // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
+ sdk_version: "31", // Needs to be a prebuilt, so not "current".
+ min_sdk_version: "19", // match with tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
libs: ["androidx.annotation_annotation"],
static_libs: [
"androidx.core_core",
@@ -140,6 +142,9 @@
],
jarjar_rules: "annotation-stripping-jarjar-rules.txt",
visibility: ["//cts/tests/tests/media/muxer:__subpackages__"],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
// Used by MediaParser to implement media container files parsing.
@@ -155,8 +160,7 @@
"com.android.media",
"//apex_available:platform",
],
- min_sdk_version: "16", // match with
- // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
+ min_sdk_version: "19", // match with tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
libs: ["androidx.annotation_annotation"],
static_libs: [
"exoplayer-annotation_stubs",
@@ -169,6 +173,9 @@
"//frameworks/base:__subpackages__",
"//packages/modules/Media/apex/framework",
],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
android_library {
@@ -186,9 +193,8 @@
"tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/res",
],
manifest: "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/AndroidManifest.xml",
- sdk_version: "31", // Needs to be a prebuilt, so not "current".
- min_sdk_version: "16", // match with
- // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
+ sdk_version: "31", // Needs to be a prebuilt, so not "current".
+ min_sdk_version: "19", // match with tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
apex_available: [
"//apex_available:platform",
],
@@ -198,11 +204,14 @@
"error_prone_annotations",
"exoplayer-annotation_stubs",
"guava",
- "jsr305"
+ "jsr305",
],
jarjar_rules: "annotation-stripping-jarjar-rules.txt",
visibility: ["//vendor:__subpackages__"], // Visibility for vendor's subdirs is not allowed, so
- // we can limit visibility to vendor, at most.
+ // we can limit visibility to vendor, at most.
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
// Exposes util classes for testing MediaParser.
@@ -223,8 +232,7 @@
"tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java",
],
sdk_version: "31",
- min_sdk_version: "16", // match with
- // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
+ min_sdk_version: "19", // match with tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
libs: ["androidx.annotation_annotation"],
static_libs: [
"exoplayer-annotation_stubs",
@@ -235,6 +243,9 @@
],
jarjar_rules: "annotation-stripping-jarjar-rules.txt",
visibility: ["//cts/tests/tests/mediaparser:__subpackages__"],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
// Exposes the assets for testing MediaParser.
@@ -242,8 +253,7 @@
name: "exoplayer-cts_media-test_assets",
manifest: "tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/library/extractor/src/main/AndroidManifest.xml",
srcs: [],
- min_sdk_version: "16", // match with
- // tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
+ min_sdk_version: "19", // match with tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/constants.gradle
visibility: ["//cts/tests/tests/mediaparser:__subpackages__"],
asset_dirs: ["tree_15dc86382f17a24a3e881e52e31a810c1ea44b49/testdata/src/test/assets/"],
// Do not compress media files.
@@ -268,6 +278,9 @@
"-0 .wav",
"-0 .webm",
],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
// Compile dummy implementations of annotations used by exoplayer but not
@@ -280,8 +293,11 @@
"//apex_available:anyapex",
"//apex_available:platform",
],
- min_sdk_version: "16",
+ min_sdk_version: "19",
srcs: ["annotation-stubs/src/**/*.java"],
static_libs: ["jsr305"],
visibility: ["//visibility:private"],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
