diff options
author | John Reck <jreck@google.com> | 2014-01-08 15:15:19 -0800 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2014-01-13 23:37:11 +0000 |
commit | 335482c41b2ac3b66da2e207b47306fb53f4b174 (patch) | |
tree | 8f29bdfaff1d160071e151a57ba47e60dc4e53ca /framesequence | |
parent | 259f6b7455a9dee4d4dcf1444b0b760307f04247 (diff) | |
download | android_frameworks_ex-335482c41b2ac3b66da2e207b47306fb53f4b174.tar.gz android_frameworks_ex-335482c41b2ac3b66da2e207b47306fb53f4b174.tar.bz2 android_frameworks_ex-335482c41b2ac3b66da2e207b47306fb53f4b174.zip |
Fix make files for unbundled tree builds
Change-Id: I6522ad5422c69852d540119b9cbda281d87fde55
(cherry picked from commit 0014f661f355008b0ada8ff9562673b69014d3f6)
Diffstat (limited to 'framesequence')
-rw-r--r-- | framesequence/Android.mk | 4 | ||||
-rw-r--r-- | framesequence/jni/Android.mk | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/framesequence/Android.mk b/framesequence/Android.mk index efce18d..cc2c16c 100644 --- a/framesequence/Android.mk +++ b/framesequence/Android.mk @@ -18,9 +18,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android-common-framesequence -#LOCAL_SDK_VERSION := 8 +LOCAL_SDK_VERSION := 8 LOCAL_SRC_FILES := $(call all-java-files-under, src) include $(BUILD_STATIC_JAVA_LIBRARY) -include $(call all-makefiles-under, $(LOCAL_PATH))
\ No newline at end of file +include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/framesequence/jni/Android.mk b/framesequence/jni/Android.mk index 7cc0af6..ee86fc1 100644 --- a/framesequence/jni/Android.mk +++ b/framesequence/jni/Android.mk @@ -19,9 +19,10 @@ include $(CLEAR_VARS) ## Main library -LOCAL_SHARED_LIBRARIES += liblog libjnigraphics LOCAL_STATIC_LIBRARIES += libgif +LOCAL_LDFLAGS := -llog -ljnigraphics + LOCAL_C_INCLUDES := \ external/giflib @@ -38,4 +39,6 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Wno-unused-variable -Wno-overloaded-virtual LOCAL_CFLAGS += -fvisibility=hidden +LOCAL_SDK_VERSION := 8 + include $(BUILD_SHARED_LIBRARY) |