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

Side by Side Diff: source/libvpx/build/make/Android.mk

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 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/README ('k') | source/libvpx/build/make/configure.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## 1 ##
2 ## Copyright (c) 2012 The WebM project authors. All Rights Reserved. 2 ## Copyright (c) 2012 The WebM project authors. All Rights Reserved.
3 ## 3 ##
4 ## Use of this source code is governed by a BSD-style license 4 ## Use of this source code is governed by a BSD-style license
5 ## that can be found in the LICENSE file in the root of the source 5 ## that can be found in the LICENSE file in the root of the source
6 ## tree. An additional intellectual property rights grant can be found 6 ## tree. An additional intellectual property rights grant can be found
7 ## in the file PATENTS. All contributing project authors may 7 ## in the file PATENTS. All contributing project authors may
8 ## be found in the AUTHORS file in the root of the source tree. 8 ## be found in the AUTHORS file in the root of the source tree.
9 ## 9 ##
10 10
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 # Add a dependency to force generation of the RTCD files. 167 # Add a dependency to force generation of the RTCD files.
168 define rtcd_dep_template 168 define rtcd_dep_template
169 rtcd_dep_template_SRCS := $(addprefix $(LOCAL_PATH)/, $(LOCAL_SRC_FILES)) 169 rtcd_dep_template_SRCS := $(addprefix $(LOCAL_PATH)/, $(LOCAL_SRC_FILES))
170 rtcd_dep_template_SRCS := $$(rtcd_dep_template_SRCS:.neon=) 170 rtcd_dep_template_SRCS := $$(rtcd_dep_template_SRCS:.neon=)
171 ifeq ($(CONFIG_VP8), yes) 171 ifeq ($(CONFIG_VP8), yes)
172 $$(rtcd_dep_template_SRCS): vp8_rtcd.h 172 $$(rtcd_dep_template_SRCS): vp8_rtcd.h
173 endif 173 endif
174 ifeq ($(CONFIG_VP9), yes) 174 ifeq ($(CONFIG_VP9), yes)
175 $$(rtcd_dep_template_SRCS): vp9_rtcd.h 175 $$(rtcd_dep_template_SRCS): vp9_rtcd.h
176 endif 176 endif
177 ifeq ($(CONFIG_VP10), yes)
178 $$(rtcd_dep_template_SRCS): vp10_rtcd.h
179 endif
177 $$(rtcd_dep_template_SRCS): vpx_scale_rtcd.h 180 $$(rtcd_dep_template_SRCS): vpx_scale_rtcd.h
178 $$(rtcd_dep_template_SRCS): vpx_dsp_rtcd.h 181 $$(rtcd_dep_template_SRCS): vpx_dsp_rtcd.h
179 182
180 ifneq ($(findstring $(TARGET_ARCH_ABI),x86 x86_64),) 183 ifneq ($(findstring $(TARGET_ARCH_ABI),x86 x86_64),)
181 $$(rtcd_dep_template_SRCS): vpx_config.asm 184 $$(rtcd_dep_template_SRCS): vpx_config.asm
182 endif 185 endif
183 endef 186 endef
184 187
185 $(eval $(call rtcd_dep_template)) 188 $(eval $(call rtcd_dep_template))
186 189
187 .PHONY: clean 190 .PHONY: clean
188 clean: 191 clean:
189 @echo "Clean: ads2gas files [$(TARGET_ARCH_ABI)]" 192 @echo "Clean: ads2gas files [$(TARGET_ARCH_ABI)]"
190 @$(RM) $(CODEC_SRCS_ASM_ADS2GAS) $(CODEC_SRCS_ASM_NEON_ADS2GAS) 193 @$(RM) $(CODEC_SRCS_ASM_ADS2GAS) $(CODEC_SRCS_ASM_NEON_ADS2GAS)
191 @$(RM) -r $(ASM_CNV_PATH) 194 @$(RM) -r $(ASM_CNV_PATH)
192 @$(RM) $(CLEAN-OBJS) 195 @$(RM) $(CLEAN-OBJS)
193 196
194 ifeq ($(ENABLE_SHARED),1) 197 ifeq ($(ENABLE_SHARED),1)
195 include $(BUILD_SHARED_LIBRARY) 198 include $(BUILD_SHARED_LIBRARY)
196 else 199 else
197 include $(BUILD_STATIC_LIBRARY) 200 include $(BUILD_STATIC_LIBRARY)
198 endif 201 endif
199 202
200 ifeq ($(CONFIG_RUNTIME_CPU_DETECT),yes) 203 ifeq ($(CONFIG_RUNTIME_CPU_DETECT),yes)
201 $(call import-module,cpufeatures) 204 $(call import-module,cpufeatures)
202 endif 205 endif
OLDNEW
« no previous file with comments | « source/libvpx/README ('k') | source/libvpx/build/make/configure.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698