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

Commit fd1854cd 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

Change-Id: I327901f4bcca937a8376c1a6d604d7293828b0c9
parents e084a08f 5f551b3f

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)