From bba5fe2bad0c15941c548ba1deef7c588cb06f4a Mon Sep 17 00:00:00 2001
From: Xindong Xu<xindong.xu@amlogic.com>
Date: Wed, 27  Dec  2017  02:19:38  +0000
Subject: ref_device_common: bringup curie [1/3]

PD# 157703

bringup curie

Change-Id: I93be627c79ab2fbdcf2120547b5d50785c92f758
---
diff --git a/audio.mk b/audio.mk
index 9c42fd4..3a66e68 100644
--- a/audio.mk
+++ b/audio.mk
@@ -21,7 +21,20 @@ PRODUCT_PACKAGES += \
     audio.r_submix.default \
     acoustics.default \
     audio_firmware \
-    libparameter
+    libparameter \
+    libamadec_omx_api \
+    libfaad    \
+    libape     \
+    libmad     \
+    libflac    \
+    libcook    \
+    libraac    \
+    libamr     \
+    libpcm     \
+    libadpcm   \
+    libpcm_wfd \
+    libaac_helix \
+    libamadec_wfd_out
 
 #PRODUCT_COPY_FILES += \
 #    $(TARGET_PRODUCT_DIR)/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
diff --git a/releasetools.py b/releasetools.py
index 63abb96..0cc6b3e 100755..100644
--- a/releasetools.py
+++ b/releasetools.py
@@ -178,7 +178,7 @@ def IncrementalOTA_VerifyEnd(info):
   print "amlogic extensions:IncrementalOTA_VerifyEnd"
 
 def IncrementalOTA_InstallBegin(info):
-  LoadInfoDict_amlogic(info.info_dict, info.input_zip);
+  LoadInfoDict_amlogic(info.info_dict, info.target_zip);
   platform = GetBuildProp("ro.board.platform", info.info_dict)
   print "ro.board.platform: %s" % (platform)
   if "meson3" in platform:
diff --git a/wifi.mk b/wifi.mk
index 4626e7a..c471b6c 100644
--- a/wifi.mk
+++ b/wifi.mk
@@ -816,9 +816,13 @@ endif
 ################################################################################## AP6255
 ifeq ($(WIFI_MODULE),AP6255)
 WIFI_DRIVER := AP6255
+
+ifneq ($(WIFI_BUILD_IN), true)
 WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
 WIFI_DRIVER_MODULE_NAME := dhd
 WIFI_DRIVER_MODULE_ARG  := "firmware_path=/vendor/etc/wifi/6255/fw_bcm43455c0_ag.bin nvram_path=/vendor/etc/wifi/6255/nvram.txt"
+endif
+
 WIFI_DRIVER_FW_PATH_STA := /vendor/etc/wifi/6255/fw_bcm43455c0_ag.bin
 WIFI_DRIVER_FW_PATH_AP  := /vendor/etc/wifi/6255/fw_bcm43455c0_ag_apsta.bin
 WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/wifi/6255/fw_bcm43455c0_ag_p2p.bin
--
cgit