diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2017-01-20 02:19:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-20 02:19:38 +0000 |
| commit | 4910e5a3520d92c4e6d37bfabc833771e7f02243 (patch) | |
| tree | 339b0ba2efbf15b29ef18e364b6998f3aa05edca /Android.mk | |
| parent | de03facdb2a48021ec2b25e25e28926c35c2acfc (diff) | |
| parent | 1679274c9cbf49a0998070d42a24207d189bbd93 (diff) | |
| download | fdk-aac-4910e5a3520d92c4e6d37bfabc833771e7f02243.tar.gz fdk-aac-4910e5a3520d92c4e6d37bfabc833771e7f02243.tar.bz2 fdk-aac-4910e5a3520d92c4e6d37bfabc833771e7f02243.zip | |
Merge "Change build config of aac from Android.mk to Android.bp" am: 8334e4b410 am: 2eba55c5a8
am: 1679274c9c
Change-Id: I17c2d7f5c558e17fc4b579d879160f4d6a6ce587
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 18bda23..0000000 --- a/Android.mk +++ /dev/null @@ -1,59 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -aacdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp)) -aacdec_sources := $(aacdec_sources:$(LOCAL_PATH)/libAACdec/src/%=%) - -aacenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp)) -aacenc_sources := $(aacenc_sources:$(LOCAL_PATH)/libAACenc/src/%=%) - -pcmutils_sources := $(sort $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp)) -pcmutils_sources := $(pcmutils_sources:$(LOCAL_PATH)/libPCMutils/src/%=%) - -fdk_sources := $(sort $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp)) -fdk_sources := $(fdk_sources:$(LOCAL_PATH)/libFDK/src/%=%) - -sys_sources := $(sort $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp)) -sys_sources := $(sys_sources:$(LOCAL_PATH)/libSYS/src/%=%) - -mpegtpdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp)) -mpegtpdec_sources := $(mpegtpdec_sources:$(LOCAL_PATH)/libMpegTPDec/src/%=%) - -mpegtpenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp)) -mpegtpenc_sources := $(mpegtpenc_sources:$(LOCAL_PATH)/libMpegTPEnc/src/%=%) - -sbrdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp)) -sbrdec_sources := $(sbrdec_sources:$(LOCAL_PATH)/libSBRdec/src/%=%) - -sbrenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp)) -sbrenc_sources := $(sbrenc_sources:$(LOCAL_PATH)/libSBRenc/src/%=%) - -LOCAL_SRC_FILES := \ - $(aacdec_sources:%=libAACdec/src/%) \ - $(aacenc_sources:%=libAACenc/src/%) \ - $(pcmutils_sources:%=libPCMutils/src/%) \ - $(fdk_sources:%=libFDK/src/%) \ - $(sys_sources:%=libSYS/src/%) \ - $(mpegtpdec_sources:%=libMpegTPDec/src/%) \ - $(mpegtpenc_sources:%=libMpegTPEnc/src/%) \ - $(sbrdec_sources:%=libSBRdec/src/%) \ - $(sbrenc_sources:%=libSBRenc/src/%) - -LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra -LOCAL_CFLAGS += "-Wno-\#warnings" -Wno-constant-logical-operand -Wno-self-assign - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/libAACdec/include \ - $(LOCAL_PATH)/libAACenc/include \ - $(LOCAL_PATH)/libPCMutils/include \ - $(LOCAL_PATH)/libFDK/include \ - $(LOCAL_PATH)/libSYS/include \ - $(LOCAL_PATH)/libMpegTPDec/include \ - $(LOCAL_PATH)/libMpegTPEnc/include \ - $(LOCAL_PATH)/libSBRdec/include \ - $(LOCAL_PATH)/libSBRenc/include - - -LOCAL_MODULE:= libFraunhoferAAC - -include $(BUILD_STATIC_LIBRARY) |