commit 6e95133c4bf42a342f70cc37b0c1d7c8283ccdb6
author Android (Google) Code Review <android-gerrit@google.com> Mon Jul 27 12:45:04 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 27 12:45:04 2009 -0700
tree ae04326293c8d475a04b1012526291bf667dc4ce
parent d9823f5cbf45c4a34e09cc571671a907a58df7b0
parent f94361b15347f02eee07e309b0388886ce796e78

Merge change 8673 into donut

* changes:
  Redo perforce change 126665-p9, which fixed an issue with songs purchased from the iTunes music store, but was lost in opencore 2.0.

Android.mk

diff --git a/Android.mk b/Android.mk
index c77b264..f1faf16 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,6 @@
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_aacdec_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_amrdec_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_mp3dec_sharedlibrary.mk
-include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_avcenc_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_m4venc_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_amrenc_sharedlibrary.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_net_support.mk
@@ -29,6 +28,10 @@
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_mp4localreg.mk
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_mp4local.mk
 
+ifeq ($(BUILD_PV_OMX_AVC_ENCODER),1)
+include $(PV_TOP)/build_config/opencore_dynamic/Android_omx_avcenc_sharedlibrary.mk
+endif
+
 ifeq ($(BUILD_PV_2WAY),1)
 include $(PV_TOP)/build_config/opencore_dynamic/Android_opencore_2way.mk
 ifeq ($(BUILD_PV_TEST_APPS),1)