From 70a2bfdb4dc984c4af30d0fb05a9ea18860d7602 Mon Sep 17 00:00:00 2001
From: Lianlian Zhu<lianlian.zhu@amlogic.com>
Date: Mon, 25  Dec  2017  03:46:46  +0000
Subject: audio: support Libaudio bring up[3/3]

PD#157556

  put all Libaudio so to vendor/lib

Change-Id: Ic309e21b2cd628e924dbab8bfe61506c55e2fc15
---
diff --git a/amadec/Android.mk b/amadec/Android.mk
index 61919ce..2cb7d24 100644
--- a/amadec/Android.mk
+++ b/amadec/Android.mk
@@ -134,6 +134,10 @@ LOCAL_SRC_FILES := \
 
 LOCAL_MODULE := libamadec
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 LOCAL_ARM_MODE := arm
 ##################################################
 #$(shell cp $(LOCAL_PATH)/acodec_lib/*.so $(TARGET_OUT)/lib)
@@ -175,6 +179,10 @@ LOCAL_MODULE := libamadec_omx_api
 LOCAL_MODULE_TAGS := optional
 LOCAL_ARM_MODE := arm
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 LOCAL_SHARED_LIBRARIES += libutils libmedia libz libbinder libdl libcutils libc libstagefright \
                           libstagefright_omx liblog libamavutils libstagefright_foundation
 LOCAL_PRELINK_MODULE := false
@@ -211,6 +219,10 @@ LOCAL_MODULE := libamadec_wfd_out
 LOCAL_MODULE_TAGS := optional
 LOCAL_ARM_MODE := arm
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 LOCAL_SHARED_LIBRARIES += libutils libtinyalsa  liblog libmedia libcutils libc \
          libmedia_helper libaudioclient libbinder libdl
 
@@ -257,7 +269,7 @@ define _add-audio-firmware-module
     LOCAL_SRC_FILES := $1
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE_CLASS := ETC
-    LOCAL_MODULE_PATH := $$(TARGET_OUT_ETC)/firmware
+    LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/firmware
     include $$(BUILD_PREBUILT)
 endef
 
diff --git a/amadec/omx_audio/Android.mk b/amadec/omx_audio/Android.mk
index 3ccb664..a2de292 100644
--- a/amadec/omx_audio/Android.mk
+++ b/amadec/omx_audio/Android.mk
@@ -21,6 +21,10 @@ LOCAL_MODULE := libamadec_omx_api
 
 LOCAL_ARM_MODE := arm
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 LOCAL_SHARED_LIBRARIES += libutils libmedia libz libbinder libdl libcutils libc libstagefright \
                           libstagefright_omx libmedia_native liblog \
                           libstagefright_foundation
diff --git a/audio_codec/libadpcm/Android.mk b/audio_codec/libadpcm/Android.mk
index 32cf969..852ac1a 100644
--- a/audio_codec/libadpcm/Android.mk
+++ b/audio_codec/libadpcm/Android.mk
@@ -9,4 +9,8 @@ LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 include $(LOCAL_PATH)/../config.mk
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_codec/libamr/Android.mk b/audio_codec/libamr/Android.mk
index acfba97..f387806 100644
--- a/audio_codec/libamr/Android.mk
+++ b/audio_codec/libamr/Android.mk
@@ -20,6 +20,10 @@ LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_codec/libape/Android.mk b/audio_codec/libape/Android.mk
index 25f0b2a..5434651 100644
--- a/audio_codec/libape/Android.mk
+++ b/audio_codec/libape/Android.mk
@@ -22,6 +22,10 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
 	LOCAL_CFLAGS += -D__ARM_HAVE_NEON -DOPT_NEON
 endif
diff --git a/audio_codec/libcook/Android.mk b/audio_codec/libcook/Android.mk
index 55beb42..87115ed 100644
--- a/audio_codec/libcook/Android.mk
+++ b/audio_codec/libcook/Android.mk
@@ -25,4 +25,8 @@ LOCAL_SHARED_LIBRARIES += libutils libmedia libz libbinder libdl libcutils libc
 
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_codec/libfaad/Android.mk b/audio_codec/libfaad/Android.mk
index 8cf44d0..d354a54 100644
--- a/audio_codec/libfaad/Android.mk
+++ b/audio_codec/libfaad/Android.mk
@@ -93,6 +93,10 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
 	 $(LOCAL_PATH)/codebook
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+ 
 #aac helix include file
 LOCAL_C_INCLUDES  += $(LOCAL_PATH)/helixaac
 
diff --git a/audio_codec/libflac/Android.mk b/audio_codec/libflac/Android.mk
index bad1265..3f309b8 100644
--- a/audio_codec/libflac/Android.mk
+++ b/audio_codec/libflac/Android.mk
@@ -19,4 +19,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_codec/liblpcm/Android.mk b/audio_codec/liblpcm/Android.mk
index 047b182..2dd3fc5 100644
--- a/audio_codec/liblpcm/Android.mk
+++ b/audio_codec/liblpcm/Android.mk
@@ -7,6 +7,11 @@ LOCAL_MODULE    := libpcm_wfd
 LOCAL_SRC_FILES := lpcm_decode.c
 #$(notdir $(wildcard $(LOCAL_PATH)/*.c))
 LOCAL_ARM_MODE := arm
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH)  $(LOCAL_PATH)/../../amadec/include $(LOCAL_PATH)/../../amadec/
 
diff --git a/audio_codec/libmad/Android.mk b/audio_codec/libmad/Android.mk
index f169151..76101f7 100644
--- a/audio_codec/libmad/Android.mk
+++ b/audio_codec/libmad/Android.mk
@@ -10,4 +10,9 @@ LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
 LOCAL_PRELINK_MODULE := false
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_codec/libpcm/Android.mk b/audio_codec/libpcm/Android.mk
index ea40534..bcb3740 100644
--- a/audio_codec/libpcm/Android.mk
+++ b/audio_codec/libpcm/Android.mk
@@ -6,6 +6,11 @@ LOCAL_SHARED_LIBRARIES += libutils libmedia libz libbinder libdl libcutils libc
 LOCAL_MODULE    := libpcm
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 LOCAL_ARM_MODE := arm
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 LOCAL_MODULE_TAGS := optional
 include $(LOCAL_PATH)/../config.mk
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_codec/libraac/Android.mk b/audio_codec/libraac/Android.mk
index 83389cb..8f449e1 100644
--- a/audio_codec/libraac/Android.mk
+++ b/audio_codec/libraac/Android.mk
@@ -44,6 +44,10 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH)\
                     $(LOCAL_PATH)/include
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+	
 LOCAL_SHARED_LIBRARIES += libutils libmedia libz libbinder libdl libcutils libc liblog
 
 LOCAL_PRELINK_MODULE := false
diff --git a/audio_codec/wfd_aac_decoder/Android.mk b/audio_codec/wfd_aac_decoder/Android.mk
index 19b5395..bf23db2 100644
--- a/audio_codec/wfd_aac_decoder/Android.mk
+++ b/audio_codec/wfd_aac_decoder/Android.mk
@@ -20,4 +20,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
 	 $(LOCAL_PATH)/codebook
 LOCAL_PRELINK_MODULE := false
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
 include $(BUILD_SHARED_LIBRARY)
--
cgit