summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Cody Schuffelen <schuffelen@google.com>2020-10-07 15:15:57 -0700
committerA. Cody Schuffelen <schuffelen@google.com>2020-11-18 18:48:05 -0800
commitc5427947e711c770a61896cb1ff93456fa9bbe79 (patch)
tree2a9afe2c177bab11bce29ece3893ae4db7814fbc
parent2efb1cd57ab1065c9a24218a838f575f97daaa8d (diff)
downloadlibwebm-c5427947e711c770a61896cb1ff93456fa9bbe79.tar.gz
ANDROID: Delete Android.mk to avoid conflicts with other imports.
Change-Id: I49f00c749b55affd55744592b1bcea3c293ba057
-rw-r--r--Android.mk17
1 files changed, 0 insertions, 17 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index b46ba10..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libwebm
-LOCAL_CPPFLAGS:=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
-LOCAL_CPPFLAGS+=-D__STDC_LIMIT_MACROS -std=c++11
-LOCAL_C_INCLUDES:= $(LOCAL_PATH)
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)
-
-LOCAL_SRC_FILES:= common/file_util.cc \
- common/hdr_util.cc \
- mkvparser/mkvparser.cc \
- mkvparser/mkvreader.cc \
- mkvmuxer/mkvmuxer.cc \
- mkvmuxer/mkvmuxerutil.cc \
- mkvmuxer/mkvwriter.cc
-include $(BUILD_STATIC_LIBRARY)