diff options
| author | A. Cody Schuffelen <schuffelen@google.com> | 2020-11-20 02:37:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-20 02:37:39 +0000 |
| commit | 721d6506da7112335a1f80ac6736d96b2d28d538 (patch) | |
| tree | 2a9afe2c177bab11bce29ece3893ae4db7814fbc | |
| parent | 1643f90bc783be6ac2c1504ed8f4e77bdd70b443 (diff) | |
| parent | 95839a5b03e9b6cc2e45fa1c93eaa2effc016a55 (diff) | |
| download | libwebm-721d6506da7112335a1f80ac6736d96b2d28d538.tar.gz | |
ANDROID: Delete Android.mk to avoid conflicts with other imports. am: c5427947e7 am: ff579d2ec5 am: 95839a5b03
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504155
Change-Id: I4741fc2f95eec460ea626cf04bb28cb19ef5645b
| -rw-r--r-- | Android.mk | 17 |
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) |