Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: source/libvpx/test/android/Android.mk

Issue 1124333011: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: only update to last nights LKGR Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « source/libvpx/libs.mk ('k') | source/libvpx/test/blockiness_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The WebM project authors. All Rights Reserved. 1 # Copyright (c) 2013 The WebM project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 # 8 #
9 # This make file builds vpx_test app for android. 9 # This make file builds vpx_test app for android.
10 # The test app itself runs on the command line through adb shell 10 # The test app itself runs on the command line through adb shell
(...skipping 22 matching lines...) Expand all
33 LOCAL_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/ 33 LOCAL_C_INCLUDES := $(LOCAL_PATH)/third_party/googletest/src/
34 LOCAL_C_INCLUDES += $(LOCAL_PATH)/third_party/googletest/src/include/ 34 LOCAL_C_INCLUDES += $(LOCAL_PATH)/third_party/googletest/src/include/
35 LOCAL_SRC_FILES := ./third_party/googletest/src/src/gtest-all.cc 35 LOCAL_SRC_FILES := ./third_party/googletest/src/src/gtest-all.cc
36 include $(BUILD_STATIC_LIBRARY) 36 include $(BUILD_STATIC_LIBRARY)
37 37
38 #libvpx_test 38 #libvpx_test
39 include $(CLEAR_VARS) 39 include $(CLEAR_VARS)
40 LOCAL_ARM_MODE := arm 40 LOCAL_ARM_MODE := arm
41 LOCAL_MODULE := libvpx_test 41 LOCAL_MODULE := libvpx_test
42 LOCAL_STATIC_LIBRARIES := gtest libwebm 42 LOCAL_STATIC_LIBRARIES := gtest libwebm
43 LOCAL_SHARED_LIBRARIES := vpx 43
44 ifeq ($(ENABLE_SHARED),1)
45 LOCAL_SHARED_LIBRARIES := vpx
46 else
47 LOCAL_STATIC_LIBRARIES += vpx
48 endif
49
44 include $(LOCAL_PATH)/test/test.mk 50 include $(LOCAL_PATH)/test/test.mk
45 LOCAL_C_INCLUDES := $(BINDINGS_DIR) 51 LOCAL_C_INCLUDES := $(BINDINGS_DIR)
46 FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes))) 52 FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes)))
47 LOCAL_SRC_FILES := $(addprefix ./test/, $(FILTERED_SRC)) 53 LOCAL_SRC_FILES := $(addprefix ./test/, $(FILTERED_SRC))
48 include $(BUILD_EXECUTABLE) 54 include $(BUILD_EXECUTABLE)
OLDNEW
« no previous file with comments | « source/libvpx/libs.mk ('k') | source/libvpx/test/blockiness_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698