commit e4e982add96412db3eb4c7229e3e6c5d86144c4a
author Tony Mak <tonymak@google.com> Wed Jun 29 21:01:09 2016 +0100
committer Tony Mak <tonymak@google.com> Wed Jun 29 20:11:17 2016 +0000
tree 2285515fa2ec4f86e6be748fdbfdda987536020e
parent 6cedb6134fb7c4cc701912a919b25273cb46e10c
parent d112c795ac1ce07d799f470cb8e7ec50efd3f340

Merge remote-tracking branch 'goog/nyc-mr1-dev' into aosp/master

Android.mk

diff --git a/Android.mk b/Android.mk
index e2ed18b..06ac9e6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,11 +64,11 @@
     LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode
 endif
 
-LOCAL_PROGUARD_FLAGS := -ignorewarnings -include build/core/proguard_basic_keeps.flags
+LOCAL_PROGUARD_FLAGS := -ignorewarnings
 
 LOCAL_PROGUARD_ENABLED := nosystem
 
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := ../../../build/core/proguard_basic_keeps.flags proguard.flags
 ifeq (eng,$(TARGET_BUILD_VARIANT))
     LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
 else

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index cd89b8f..dbc0674 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -29,7 +29,7 @@
 
 LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Wno-switch
 
-LOCAL_SDK_VERSION := 8
+LOCAL_SDK_VERSION := 19
 LOCAL_NDK_STL_VARIANT := c++_static # LLVM libc++
 
 include $(BUILD_SHARED_LIBRARY)