Snap for 8564071 from 2536fe25a69f90b7c380dc4ddff269403ebe9a0b to mainline-sdkext-release
Change-Id: I2f2327339380e21e5bf0b570c19fd4400507f1a7
diff --git a/Android.bp b/Android.bp
index af7b348..71406d8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,6 +59,13 @@
},
},
min_sdk_version: "29",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.media",
+ "com.android.media.swcodec",
+ "test_com.android.media.swcodec",
+ ],
+
}
cc_library_headers {
@@ -72,6 +79,13 @@
},
},
min_sdk_version: "29",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.media",
+ "com.android.media.swcodec",
+ "test_com.android.media.swcodec",
+ ],
+
}
subdirs = ["src/libFLAC"]
diff --git a/METADATA b/METADATA
index b760b2b..4acf938 100644
--- a/METADATA
+++ b/METADATA
@@ -9,10 +9,7 @@
value: "https://github.com/xiph/flac.git"
}
version: "bfd4f13f3eb1f4d4f9f723e343f63eceedb267ba"
- # Would be RESTRICTED save for GFDL in:
- # README
- # COPYING.FDL
- # doc/html/flac.css
+ license_note: "Would be RESTRICTED save for GFDL in: README, COPYING.FDL, and doc/html/flac.css"
license_type: BY_EXCEPTION_ONLY
last_upgrade_date {
year: 2020
diff --git a/src/libFLAC/Android.bp b/src/libFLAC/Android.bp
index 3d32da2..a08fae0 100644
--- a/src/libFLAC/Android.bp
+++ b/src/libFLAC/Android.bp
@@ -75,4 +75,11 @@
},
},
min_sdk_version: "29",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.media",
+ "com.android.media.swcodec",
+ "test_com.android.media.swcodec",
+ ],
+
}