aboutsummaryrefslogtreecommitdiffstats
path: root/Android.bp
diff options
context:
space:
mode:
authorPavlin Radoslavov <pavlin@google.com>2017-01-19 12:03:23 -0800
committerPavlin Radoslavov <pavlin@google.com>2017-01-19 13:10:11 -0800
commit6cc0003b74222dddd54ae985a3446b2c478ff353 (patch)
tree339b0ba2efbf15b29ef18e364b6998f3aa05edca /Android.bp
parent664e5f27946c3949e2f0aa87f48efe6bbce101c1 (diff)
downloadfdk-aac-6cc0003b74222dddd54ae985a3446b2c478ff353.tar.gz
fdk-aac-6cc0003b74222dddd54ae985a3446b2c478ff353.tar.bz2
fdk-aac-6cc0003b74222dddd54ae985a3446b2c478ff353.zip
Change build config of aac from Android.mk to Android.bp
* In an effort to modernize build configurations to the new Soong system, we need to upgrade existing Android.mk files to Android.bp * This file is done by using the following steps: 1. Manually removing all *_sources from Android.mk, because of the unusual make logic they use 2. Running the auto-conversion tool: androidmk Android.mk > Android.bp 3. Editing the result Android.bp: 3.1. Writing the "srcs" list 3.2. Removing the escaping around -Wno-#warnings in cflags, because those are not needed anymore 3.3. Renamed local_include_dirs to export_include_dirs to facilititate the inclusion of header files. It appears users of libFraunhoferAAC are using header files from all include directories, hence the renaming. Test: Code compilation ("mm" in external/aac, and "make" in top-directory) Bug: b/32958753 b/34454142 Change-Id: Ie89f73722908e8734f4b88f1407952311ec064af
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp32
1 files changed, 32 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..75fe8af
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,32 @@
+cc_library_static {
+ name: "libFraunhoferAAC",
+ srcs: [
+ "libAACdec/src/*.cpp",
+ "libAACenc/src/*.cpp",
+ "libPCMutils/src/*.cpp",
+ "libFDK/src/*.cpp",
+ "libSYS/src/*.cpp",
+ "libMpegTPDec/src/*.cpp",
+ "libMpegTPEnc/src/*.cpp",
+ "libSBRdec/src/*.cpp",
+ "libSBRenc/src/*.cpp",
+ ],
+ cflags: [
+ "-Wno-sequence-point",
+ "-Wno-extra",
+ "-Wno-#warnings",
+ "-Wno-constant-logical-operand",
+ "-Wno-self-assign",
+ ],
+ export_include_dirs: [
+ "libAACdec/include",
+ "libAACenc/include",
+ "libPCMutils/include",
+ "libFDK/include",
+ "libSYS/include",
+ "libMpegTPDec/include",
+ "libMpegTPEnc/include",
+ "libSBRdec/include",
+ "libSBRenc/include",
+ ],
+}