diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-06-16 09:54:28 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-06-16 09:54:28 -0700 |
| commit | 5f551b3fdc10e38276eab7737c5d8035fb3b1299 (patch) | |
| tree | 9bae5cd6cb7e749d51d4f3802ba18e88d4bd3ae4 /tests/Camera2Tests | |
| parent | 438dc91a41ee90f5f219c0502a2be781a2150e39 (diff) | |
| parent | 20d55a7779cd5e22e8aab51193a91e486b17d21b (diff) | |
resolve merge conflicts of 20d55a7 to stage-aosp-master
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
Diffstat (limited to 'tests/Camera2Tests')
| -rw-r--r-- | tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk index 39ad0ac4bcdb..088f322ed324 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk @@ -40,12 +40,6 @@ LOCAL_SRC_FILES := contrast.cpp \ LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter -LOCAL_STATIC_LIBRARIES += \ - libcutils - -LOCAL_C_INCLUDES += \ - system/core/include \ - LOCAL_NDK_STL_VARIANT := stlport_static include $(BUILD_SHARED_LIBRARY) |