Skip to content

GitLab

Commit b548607e authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Bump SDK version to 17 to match dependencies." 

am: d1b7453e

Change-Id: Ib38a3804c235bf94d68d57a64c040d256a064d5c
parents 3d3ff15b d1b7453e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
jni/Android.mk
View file @ b548607e
......@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := .cc
LOCAL_LDFLAGS := -llog -ljnigraphics
LOCAL_SDK_VERSION := 9
LOCAL_SDK_VERSION := 17
LOCAL_MODULE := libjni_tinyplanet
LOCAL_SRC_FILES := tinyplanet.cc
......@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
LOCAL_CFLAGS := -std=c++11
LOCAL_NDK_STL_VARIANT := c++_static
LOCAL_LDFLAGS := -llog -ldl -ljnigraphics
LOCAL_SDK_VERSION := 9
LOCAL_SDK_VERSION := 17
LOCAL_MODULE := libjni_jpegutil
LOCAL_SRC_FILES := jpegutil.cpp jpegutilnative.cpp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment