From 28e5bccf28fe8b3a742ad46bdadf50a066ff8393 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 11 Jul 2012 19:50:59 -0700 Subject: use LOCAL_PATH properly Change-Id: I5a177116b976be159042cab51c297861f275daa2 --- Android.mk | 3 +- pico/Android.mk | 127 +++------------------------------------------ pico/compat/jni/Android.mk | 8 +-- pico/lib/Android.mk | 46 ++++++++++++++++ pico/tts/Android.mk | 54 +++++++++++++++++++ 5 files changed, 112 insertions(+), 126 deletions(-) create mode 100644 pico/lib/Android.mk create mode 100644 pico/tts/Android.mk diff --git a/Android.mk b/Android.mk index edd15f9..720c834 100755 --- a/Android.mk +++ b/Android.mk @@ -1 +1,2 @@ -include ./external/svox/pico/Android.mk +LOCAL_PATH:= $(call my-dir) +include $(LOCAL_PATH)/pico/Android.mk diff --git a/pico/Android.mk b/pico/Android.mk index 444cbdf..61b38a1 100755 --- a/pico/Android.mk +++ b/pico/Android.mk @@ -1,133 +1,22 @@ # SVOX Pico TTS Engine # This makefile builds both an activity and a shared library. -TOP_LOCAL_PATH:= $(call my-dir) - -# Build Pico activity - -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ +LOCAL_PACKAGE_NAME := PicoTts + +LOCAL_SRC_FILES := \ + $(call all-java-files-under, src) \ $(call all-java-files-under, compat) -LOCAL_PACKAGE_NAME := PicoTts LOCAL_REQUIRED_MODULES := libttscompat libttspico - LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) -# Build static library containing all PICO code -# excluding the compatibility code. This is identical -# to the rule below / except that it builds a shared -# library. -LOCAL_PATH:= $(TOP_LOCAL_PATH)/tts -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES:= com_svox_picottsengine.cpp svox_ssml_parser.cpp - -LOCAL_C_INCLUDES += \ - external/svox/pico/lib \ - external/svox/pico/compat/include - -LOCAL_STATIC_LIBRARIES:= libsvoxpico - -LOCAL_SHARED_LIBRARIES:= libcutils libexpat libutils - -LOCAL_MODULE:= libttspico_engine - -LOCAL_ARM_MODE:= arm - -include $(BUILD_STATIC_LIBRARY) - -# Build Pico Shared Library. This rule is used by the -# compatibility code, which opens this shared library -# using dlsym. This is essentially the same as the rule -# above, except that it packages things a shared library. -LOCAL_PATH:= $(TOP_LOCAL_PATH)/tts -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES:= com_svox_picottsengine.cpp svox_ssml_parser.cpp -LOCAL_C_INCLUDES += \ - external/svox/pico/lib \ - external/svox/pico/compat/include -LOCAL_STATIC_LIBRARIES:= libsvoxpico -LOCAL_SHARED_LIBRARIES:= libcutils libexpat libutils -LOCAL_MODULE:= libttspico - -include $(BUILD_SHARED_LIBRARY) - - -# Build Base Generic SVOX Pico Library -LOCAL_PATH:= $(TOP_LOCAL_PATH)/lib -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - picoacph.c \ - picoapi.c \ - picobase.c \ - picocep.c \ - picoctrl.c \ - picodata.c \ - picodbg.c \ - picoextapi.c \ - picofftsg.c \ - picokdbg.c \ - picokdt.c \ - picokfst.c \ - picoklex.c \ - picoknow.c \ - picokpdf.c \ - picokpr.c \ - picoktab.c \ - picoos.c \ - picopal.c \ - picopam.c \ - picopr.c \ - picorsrc.c \ - picosa.c \ - picosig.c \ - picosig2.c \ - picospho.c \ - picotok.c \ - picotrns.c \ - picowa.c - - - -LOCAL_MODULE:= libsvoxpico - -LOCAL_CFLAGS+= $(TOOL_CFLAGS) - -LOCAL_LDFLAGS+= $(TOOL_LDFLAGS) - -include $(BUILD_STATIC_LIBRARY) - - -# Build compatibility library -LOCAL_PATH:= $(TOP_LOCAL_PATH)/compat/jni -include $(CLEAR_VARS) - -LOCAL_MODULE:= libttscompat -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES:= \ - com_android_tts_compat_SynthProxy.cpp -LOCAL_SHARED_LIBRARIES := \ - libandroid_runtime \ - libnativehelper \ - libmedia \ - libmedia_native \ - libutils \ - libcutils \ - libdl +include $(LOCAL_PATH)/compat/jni/Android.mk \ + $(LOCAL_PATH)/lib/Android.mk \ + $(LOCAL_PATH)/tts/Android.mk -include $(BUILD_SHARED_LIBRARY) diff --git a/pico/compat/jni/Android.mk b/pico/compat/jni/Android.mk index a06d620..f97d2c0 100755 --- a/pico/compat/jni/Android.mk +++ b/pico/compat/jni/Android.mk @@ -2,7 +2,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE:= libttscompat -LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES:= \ com_android_tts_compat_SynthProxy.cpp @@ -17,10 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libmedia_native \ libutils \ - libcutils - -LOCAL_SHARED_LIBRARIES += libdl - -LOCAL_ARM_MODE := arm + libcutils \ + libdl include $(BUILD_SHARED_LIBRARY) diff --git a/pico/lib/Android.mk b/pico/lib/Android.mk new file mode 100644 index 0000000..70f0099 --- /dev/null +++ b/pico/lib/Android.mk @@ -0,0 +1,46 @@ +# Build Base Generic SVOX Pico Library + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := libsvoxpico + +LOCAL_SRC_FILES := \ + picoacph.c \ + picoapi.c \ + picobase.c \ + picocep.c \ + picoctrl.c \ + picodata.c \ + picodbg.c \ + picoextapi.c \ + picofftsg.c \ + picokdbg.c \ + picokdt.c \ + picokfst.c \ + picoklex.c \ + picoknow.c \ + picokpdf.c \ + picokpr.c \ + picoktab.c \ + picoos.c \ + picopal.c \ + picopam.c \ + picopr.c \ + picorsrc.c \ + picosa.c \ + picosig.c \ + picosig2.c \ + picospho.c \ + picotok.c \ + picotrns.c \ + picowa.c + +LOCAL_CFLAGS+= $(TOOL_CFLAGS) +LOCAL_LDFLAGS+= $(TOOL_LDFLAGS) + +include $(BUILD_STATIC_LIBRARY) + + + + diff --git a/pico/tts/Android.mk b/pico/tts/Android.mk new file mode 100644 index 0000000..b492021 --- /dev/null +++ b/pico/tts/Android.mk @@ -0,0 +1,54 @@ +LOCAL_PATH := $(call my-dir) + +# Build static library containing all PICO code +# excluding the compatibility code. This is identical +# to the rule below / except that it builds a shared +# library. +include $(CLEAR_VARS) + +LOCAL_MODULE := libttspico_engine + +LOCAL_SRC_FILES := \ + com_svox_picottsengine.cpp \ + svox_ssml_parser.cpp + +LOCAL_C_INCLUDES += \ + external/svox/pico/lib \ + external/svox/pico/compat/include + +LOCAL_STATIC_LIBRARIES := libsvoxpico + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libexpat \ + libutils + +LOCAL_ARM_MODE := arm + +include $(BUILD_STATIC_LIBRARY) + + +# Build Pico Shared Library. This rule is used by the +# compatibility code, which opens this shared library +# using dlsym. This is essentially the same as the rule +# above, except that it packages things a shared library. +include $(CLEAR_VARS) + +LOCAL_MODULE := libttspico + +LOCAL_SRC_FILES := \ + com_svox_picottsengine.cpp \ + svox_ssml_parser.cpp + +LOCAL_C_INCLUDES += \ + external/svox/pico/lib \ + external/svox/pico/compat/include + +LOCAL_STATIC_LIBRARIES := libsvoxpico +LOCAL_SHARED_LIBRARIES := libcutils libexpat libutils + +include $(BUILD_SHARED_LIBRARY) + + + + -- cgit v1.1