Snap for 8730993 from 363cb20eb90577f994f409fa8577967e24d21d5c to mainline-tzdata3-release
Change-Id: I6133611119e1fc89315733b31a01201d7574ac55
diff --git a/Android.bp b/Android.bp
index ecd4bb8..e76d66d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1191,10 +1191,6 @@
blocklist: "libvpx_blocklist.txt",
},
min_sdk_version: "29",
- apex_available: [
- "//apex_available:platform",
- "com.android.media.swcodec",
- ],
}
cc_fuzz {
diff --git a/Android.bp.in b/Android.bp.in
index 1a3f7dd..3d6fb28 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -96,10 +96,6 @@
blocklist: "libvpx_blocklist.txt",
},
min_sdk_version: "29",
- apex_available: [
- "//apex_available:platform",
- "com.android.media.swcodec",
- ],
}
cc_fuzz {
diff --git a/METADATA b/METADATA
index 4859849..d97975c 100644
--- a/METADATA
+++ b/METADATA
@@ -1,6 +1,3 @@
third_party {
license_type: NOTICE
- security {
- tag: "NVD-CPE2.3:cpe:/a:webmproject:libvpx:-"
- }
}
diff --git a/OWNERS b/OWNERS
index acbe806..dbf2c0e 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,6 @@
# owners for external/libvpx
include platform/frameworks/av:/media/janitors/codec_OWNERS
jianj@google.com
+marcone@google.com
jzern@google.com
vigneshv@google.com
diff --git a/libvpx/test/android/Android.mk b/libvpx/test/android/Android.mk
index 87155fc..7318de2 100644
--- a/libvpx/test/android/Android.mk
+++ b/libvpx/test/android/Android.mk
@@ -34,9 +34,6 @@
LOCAL_C_INCLUDES += $(LOCAL_PATH)/third_party/googletest/src/include/
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/include/
LOCAL_SRC_FILES := ./third_party/googletest/src/src/gtest-all.cc
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS
include $(BUILD_STATIC_LIBRARY)
#libvpx_test
@@ -51,9 +48,6 @@
LOCAL_STATIC_LIBRARIES += vpx
endif
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../LICENSE $(LOCAL_PATH)/../../PATENTS
include $(LOCAL_PATH)/test/test.mk
LOCAL_C_INCLUDES := $(BINDINGS_DIR)
FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes)))
diff --git a/libvpx/third_party/libwebm/Android.mk b/libvpx/third_party/libwebm/Android.mk
index 23f935f..3b3dd1d 100644
--- a/libvpx/third_party/libwebm/Android.mk
+++ b/libvpx/third_party/libwebm/Android.mk
@@ -14,7 +14,4 @@
mkvmuxer/mkvmuxer.cc \
mkvmuxer/mkvmuxerutil.cc \
mkvmuxer/mkvwriter.cc
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE.TXT $(LOCAL_PATH)/PATENTS.TXT
include $(BUILD_STATIC_LIBRARY)
diff --git a/libwebm/Android.bp b/libwebm/Android.bp
index e6ebce0..f33f16e 100644
--- a/libwebm/Android.bp
+++ b/libwebm/Android.bp
@@ -20,10 +20,6 @@
// cfi: true,
},
min_sdk_version: "29",
- apex_available: [
- "//apex_available:platform",
- "com.android.media",
- ],
host_supported: true,
target: {
darwin: {
