diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-03-06 12:04:09 -0800 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2015-03-06 12:22:25 -0800 |
| commit | c4fb3345f114b47c8893ab0482ad850f99f65b7c (patch) | |
| tree | da1022bd2bfaf2e907844c1c9555bbd5b0a8df9e /media | |
| parent | 2129895bac582be50d3fe067bd5cf5a088863b3a (diff) | |
| download | frameworks_av-c4fb3345f114b47c8893ab0482ad850f99f65b7c.zip frameworks_av-c4fb3345f114b47c8893ab0482ad850f99f65b7c.tar.gz frameworks_av-c4fb3345f114b47c8893ab0482ad850f99f65b7c.tar.bz2 | |
libmediaplayerservice: fix make file for 64bit build.
Bug: 19265536
Change-Id: I5fa9ca39909b8ae2d6c2da8ac9fd3c4f9863b1f3
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/tests/Android.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/media/libmediaplayerservice/tests/Android.mk b/media/libmediaplayerservice/tests/Android.mk index 69d4ad1..7bc78ff 100644 --- a/media/libmediaplayerservice/tests/Android.mk +++ b/media/libmediaplayerservice/tests/Android.mk @@ -1,7 +1,6 @@ # Build the unit tests. LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := DrmSessionManager_test @@ -19,13 +18,7 @@ LOCAL_C_INCLUDES := \ frameworks/av/include \ frameworks/av/media/libmediaplayerservice \ -include $(BUILD_NATIVE_TEST) +LOCAL_32_BIT_ONLY := true -# Include subdirectory makefiles -# ============================================================ +include $(BUILD_NATIVE_TEST) -# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework -# team really wants is to build the stuff defined by this makefile. -ifeq (,$(ONE_SHOT_MAKEFILE)) -include $(call first-makefiles-under,$(LOCAL_PATH)) -endif |