commit 0c1111aa38fee3f077f9fe515feee5fc211da564
author The Android Automerger <android-build@google.com> Tue Feb 02 08:40:16 2016 -0800
committer The Android Automerger <android-build@google.com> Tue Feb 02 08:40:16 2016 -0800
tree cb8892d4fbfafc35a27be672fe8f295d1d48012d
parent 5185e6e5c5a1398aab776e4a7a6e4a061bc0035d
parent 4913877aafd6f05609cdb22360bdf8caa120453a

merge in nyc-release history after reset to master

pico/Android.mk

diff --git a/pico/Android.mk b/pico/Android.mk
index 91ce83b..2f6420e 100755
--- a/pico/Android.mk
+++ b/pico/Android.mk
@@ -1,11 +1,14 @@
 # SVOX Pico TTS Engine
 # This makefile builds both an activity and a shared library.
 
+#disable build in PDK
+ifneq ($(TARGET_BUILD_PDK),true)
+
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_PACKAGE_NAME := PicoTts
-	
+
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \
     $(call all-java-files-under, compat)
@@ -19,3 +22,5 @@
 include $(LOCAL_PATH)/compat/jni/Android.mk \
     $(LOCAL_PATH)/lib/Android.mk \
     $(LOCAL_PATH)/tts/Android.mk
+
+endif #TARGET_BUILD_PDK