Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45a7e7af authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

resolve merge conflicts of 20d55a77 to stage-aosp-master am: 5f551b3f am: fd1854cd 

am: 04e9d830

Change-Id: I4add0a1b114c4e56343484acb9e855137e720be3
parents 3c665dc9 04e9d830

tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk

+0 −6
Original line number Diff line number Diff line
@@ -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)