commit e504c05562181535b8c150d985ebf65590cdfabf
author Dan Albert <danalbert@google.com> Fri Mar 11 23:33:18 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 11 23:33:18 2016 +0000
tree cc206d38736e602d90c156f3a5cd5c54edb880b9
parent 647ab961c08d1e9ebd4de52085cc727ad62089ab
parent d999344a046d0c02a71d84494f6bb78b6505147f

Merge "Stop targeting froyo. It isn't supported."

cpp/Android.mk

diff --git a/cpp/Android.mk b/cpp/Android.mk
index 9948973..f2934f6 100644
--- a/cpp/Android.mk
+++ b/cpp/Android.mk
@@ -10,7 +10,7 @@
 LOCAL_CFLAGS += -Wno-unused-parameter -std=c++11
 
 LOCAL_MODULE:= libRSDispatch
-LOCAL_SDK_VERSION := 8
+LOCAL_SDK_VERSION := 9
 LOCAL_MODULE_TAGS := optional
 LOCAL_LDFLAGS += -ldl
 # Used in librsjni, which is built as NDK code => no ASan.
@@ -71,7 +71,7 @@
 LOCAL_CFLAGS += $(local_cflags_for_rs_cpp)
 
 ifeq ($(my_32_64_bit_suffix),32)
-LOCAL_SDK_VERSION := 8
+LOCAL_SDK_VERSION := 9
 else
 LOCAL_SDK_VERSION := 21
 endif

tests/cppreduce/Android.mk

diff --git a/tests/cppreduce/Android.mk b/tests/cppreduce/Android.mk
index 37efd12..044d750 100644
--- a/tests/cppreduce/Android.mk
+++ b/tests/cppreduce/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SDK_VERSION := 8
+LOCAL_SDK_VERSION := 9
 LOCAL_NDK_STL_VARIANT := stlport_static
 
 LOCAL_RENDERSCRIPT_FLAGS := -target-api 0