diff options
| author | Marco Nelissen <marcone@google.com> | 2014-05-05 21:49:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-05 21:49:25 +0000 |
| commit | 91d8ec1860e8186cd202f9415f6b41c20fbd54fb (patch) | |
| tree | 81a67b21ef1a7c0e024d1fe15311f6ab893878f8 /media | |
| parent | 67c9437dcf0d4076ed12c1f6ec157e4c7d6f353b (diff) | |
| parent | 83ae5be9a9928a7265e40d2906530e56eb3bc20c (diff) | |
| download | frameworks_av-91d8ec1860e8186cd202f9415f6b41c20fbd54fb.zip frameworks_av-91d8ec1860e8186cd202f9415f6b41c20fbd54fb.tar.gz frameworks_av-91d8ec1860e8186cd202f9415f6b41c20fbd54fb.tar.bz2 | |
Merge "Don't build libmediandk for PDK"
Diffstat (limited to 'media')
| -rw-r--r-- | media/ndk/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/ndk/Android.mk b/media/ndk/Android.mk index 0ea0c3f..82fb970 100644 --- a/media/ndk/Android.mk +++ b/media/ndk/Android.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2010 The Android Open Source Project +# Copyright (C) 2014 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ LOCAL_PATH:= $(call my-dir) +ifneq ($(TARGET_BUILD_PDK), true) + include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ @@ -39,3 +41,5 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ include $(BUILD_SHARED_LIBRARY) + +endif |