Commit ba8b18e1 authored by Dan Willemsen's avatar Dan Willemsen Committed by Android Git Automerger

am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"

* commit '5e7b21bb':
  build: wildcard isn't guaranteed to be sorted
parents 267940f5 5e7b21bb
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
aacdec_sources := $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp) aacdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp))
aacdec_sources := $(aacdec_sources:$(LOCAL_PATH)/libAACdec/src/%=%) aacdec_sources := $(aacdec_sources:$(LOCAL_PATH)/libAACdec/src/%=%)
aacenc_sources := $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp) aacenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp))
aacenc_sources := $(aacenc_sources:$(LOCAL_PATH)/libAACenc/src/%=%) aacenc_sources := $(aacenc_sources:$(LOCAL_PATH)/libAACenc/src/%=%)
pcmutils_sources := $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp) pcmutils_sources := $(sort $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp))
pcmutils_sources := $(pcmutils_sources:$(LOCAL_PATH)/libPCMutils/src/%=%) pcmutils_sources := $(pcmutils_sources:$(LOCAL_PATH)/libPCMutils/src/%=%)
fdk_sources := $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp) fdk_sources := $(sort $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp))
fdk_sources := $(fdk_sources:$(LOCAL_PATH)/libFDK/src/%=%) fdk_sources := $(fdk_sources:$(LOCAL_PATH)/libFDK/src/%=%)
sys_sources := $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp) sys_sources := $(sort $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp))
sys_sources := $(sys_sources:$(LOCAL_PATH)/libSYS/src/%=%) sys_sources := $(sys_sources:$(LOCAL_PATH)/libSYS/src/%=%)
mpegtpdec_sources := $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp) mpegtpdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp))
mpegtpdec_sources := $(mpegtpdec_sources:$(LOCAL_PATH)/libMpegTPDec/src/%=%) mpegtpdec_sources := $(mpegtpdec_sources:$(LOCAL_PATH)/libMpegTPDec/src/%=%)
mpegtpenc_sources := $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp) mpegtpenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp))
mpegtpenc_sources := $(mpegtpenc_sources:$(LOCAL_PATH)/libMpegTPEnc/src/%=%) mpegtpenc_sources := $(mpegtpenc_sources:$(LOCAL_PATH)/libMpegTPEnc/src/%=%)
sbrdec_sources := $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp) sbrdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp))
sbrdec_sources := $(sbrdec_sources:$(LOCAL_PATH)/libSBRdec/src/%=%) sbrdec_sources := $(sbrdec_sources:$(LOCAL_PATH)/libSBRdec/src/%=%)
sbrenc_sources := $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp) sbrenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp))
sbrenc_sources := $(sbrenc_sources:$(LOCAL_PATH)/libSBRenc/src/%=%) sbrenc_sources := $(sbrenc_sources:$(LOCAL_PATH)/libSBRenc/src/%=%)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment