1 files changed, 8 insertions, 3 deletions

diff --git a/audio/Android.mk b/audio/Android.mk
index 2d0ff86..8defccb 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ifeq ($(TARGET_BOARD_PLATFORM), $(filter $(TARGET_BOARD_PLATFORM), omap4 omap5 jacinto6))
 ifdef OMAP_ENHANCEMENT
 
 LOCAL_PATH := $(call my-dir)
@@ -21,6 +20,8 @@ LOCAL_PATH := $(call my-dir)
 ### OMAP ABE AUDIO HAL
 ###
 
+ifeq ($(TARGET_BOARD_PLATFORM), $(filter $(TARGET_BOARD_PLATFORM), omap4 omap5))
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)
@@ -38,10 +39,14 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
+endif # omap4, omap5
+
 ###
 ### OMAP HDMI AUDIO HAL
 ###
 
+ifeq ($(TARGET_BOARD_PLATFORM), $(filter $(TARGET_BOARD_PLATFORM), omap4 omap5 jacinto6))
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := audio.hdmi.$(TARGET_BOARD_PLATFORM)
@@ -61,5 +66,5 @@ LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
-endif
-endif
+endif # omap4, omap5, jacinto6
+endif # OMAP_ENHANCEMENT