Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 20d55a7 to stage-aosp-master

Browse Source 
am: 5f551b3fdc

Change-Id: I327901f4bcca937a8376c1a6d604d7293828b0c9
This commit is contained in:
Dan Willemsen
2016-06-16 17:01:55 +00:00
committed by android-build-merger
parent e084a08ff5 5f551b3fdc
commit fd1854cdfa
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
View File

@@ -40,12 +40,6 @@ LOCAL_SRC_FILES := contrast.cpp \
LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter
LOCAL_STATIC_LIBRARIES += \
libcutils
LOCAL_C_INCLUDES += \
system/core/include \
LOCAL_NDK_STL_VARIANT := stlport_static LOCAL_NDK_STL_VARIANT := stlport_static
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)