From 6cc0003b74222dddd54ae985a3446b2c478ff353 Mon Sep 17 00:00:00 2001
From: Pavlin Radoslavov <pavlin@google.com>
Date: Thu, 19 Jan 2017 12:03:23 -0800
Subject: [PATCH] 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
---
 Android.bp | 32 +++++++++++++++++++++++++++++
 Android.mk | 59 ------------------------------------------------------
 2 files changed, 32 insertions(+), 59 deletions(-)
 create mode 100644 Android.bp
 delete mode 100644 Android.mk

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",
+    ],
+}
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)