Merge "Fix AAC encoder test util and remove files that are not needed"

	useData.memflag = VO_IMF_USERMEMOPERATOR;

	useData.memData = (VO_PTR)(&moper);

	// open encoder dll;

	handle = dlopen("/data/local/tmp/libvoAACEncv7.so", RTLD_NOW);

	handle = dlopen("libstagefright.so", RTLD_NOW);

	if(handle == 0)

	{

		printf("open dll error......");

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := 	AAC_E_SAMPLES.c

LOCAL_SRC_FILES := \

    AAC_E_SAMPLES.c \

    ../../common/cmnMemory.c

LOCAL_SRC_FILES += 	\

	../../../Common/cmnMemory.c 

LOCAL_CFLAGS += $(VO_CFLAGS)

LOCAL_MODULE := TestvoAACEnc

LOCAL_MODULE_TAGS := debug

LOCAL_ARM_MODE := arm

LOCAL_MODULE := AACEncTest

LOCAL_STATIC_LIBRARIES := 

LOCAL_ARM_MODE := arm

LOCAL_SHARED_LIBRARIES := libvoAACEnc

LOCAL_SHARED_LIBRARIES := \

    libstagefright \

    libdl

LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/ \

	$(LOCAL_PATH)/../../../Common \

	$(LOCAL_PATH)/../../../Include \

LOCAL_CFLAGS := $(VO_CFLAGS)

    $(LOCAL_PATH)/../../common \

    $(LOCAL_PATH)/../../common/include \

include $(BUILD_EXECUTABLE)

#/*

#** Copyright 2003-2010, VisualOn, Inc.

#**

#** Licensed under the Apache License, Version 2.0 (the "License");

#** you may not use this file except in compliance with the License.

#** You may obtain a copy of the License at

#**

#**     http://www.apache.org/licenses/LICENSE-2.0

#**

#** Unless required by applicable law or agreed to in writing, software

#** distributed under the License is distributed on an "AS IS" BASIS,

#** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

#** See the License for the specific language governing permissions and

#** limitations under the License.

#*/

# target6

# available: pc, v4(armv4), v5(armv5), v5x(armv5 xscale), v6(armv6), v7(cortex-a8 neon)

VOTT:= v7

# module type

# please specify the type of your module: lib or exe

VOMT:= exe

# module macros

# please append the additional macro definitions here for your module if necessary. 

# e.g. -DVISUALON, macro VISUALON defined for your module 

VOMM:= #ARMV5E

# please specify the name of your module

VOTARGET:= voAACEncTestv7

# please modify here to be sure to see the g1.mk

include ../../../../Tools/eclair.mk 

# dependent libraries.

VODEPLIBS:=-ldl

# module source

# please modify here to be sure to see the ms.mk which specifies all source info of your module

include ../ms.mk

# please specify where is the voRelease on your PC, relative path is suggested

VORELDIR:=../../../../../Release/

# please modify here to be sure to see the doit.mk

include ../../../../Tools/doit.mk 

#/*

#** Copyright 2003-2010, VisualOn, Inc.

#**

#** Licensed under the Apache License, Version 2.0 (the "License");

#** you may not use this file except in compliance with the License.

#** You may obtain a copy of the License at

#**

#**     http://www.apache.org/licenses/LICENSE-2.0

#**

#** Unless required by applicable law or agreed to in writing, software

#** distributed under the License is distributed on an "AS IS" BASIS,

#** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

#** See the License for the specific language governing permissions and

#** limitations under the License.

#*/

# please list all objects needed by your target here

OBJS:=AAC_E_SAMPLES.o	cmnMemory.o

# please list all directories that all source files relative with your module(.h .c .cpp) locate 

VOSRCDIR:=../ ../../../../include  ../../../../Common

#/*

# ** Copyright 2003-2010, VisualOn, Inc.

# **

# ** Licensed under the Apache License, Version 2.0 (the "License");

# ** you may not use this file except in compliance with the License.

# ** You may obtain a copy of the License at

# **

# **     http://www.apache.org/licenses/LICENSE-2.0

# **

# ** Unless required by applicable law or agreed to in writing, software

# ** distributed under the License is distributed on an "AS IS" BASIS,

# ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# ** See the License for the specific language governing permissions and

# ** limitations under the License.

# */

VERBOSE:=@

VOMT ?= lib

ifeq ($(VOMT), lib)

LIB_STATIC=$(VOTARGET).a

LIB_DYNAMIC=$(VOTARGET).so

endif

ifeq ($(VOMT), exe)

TARGET=$(VOTARGET)

endif

CFLAGS=$(VOCFLAGS) $(addprefix -I, $(VOSRCDIR)) 

CPPFLAGS=$(VOCPPFLAGS) $(addprefix -I, $(VOSRCDIR)) 

ifneq ($(VOTT), pc)

ASFLAGS=$(VOASFLAGS) $(addprefix -I, $(VOSRCDIR)) 

endif

LDFLAGS:=$(VOLDFLAGS)

VOTEDEPS+=$(VODEPLIBS)

VOTLDEPS+=$(VODEPLIBS)

VOSTCLIBS ?=

vpath %.c $(VOSRCDIR)

vpath %.cpp $(VOSRCDIR)

ifneq ($(VOTT), pc)

vpath %.s $(VOSRCDIR)

endif

ifeq ($(VOTT), pc)

BLTDIRS=$(VORELDIR)/Linux/static

BLTDIRD=$(VORELDIR)/Linux/shared

else

BLTDIRS=$(VORELDIR)/Google/$(VONJ)/lib/$(VOTT)

BLTDIRD=$(VORELDIR)/Google/$(VONJ)/so/$(VOTT)

endif

.PRECIOUS: $(OBJDIR)/%.o

ifeq ($(VOMT), lib)

all: mkdirs $(LIB_STATIC) $(LIB_DYNAMIC)

mkdirs: $(OBJDIR) $(BLTDIRS) $(BLTDIRD)

else

all: mkdirs $(TARGET)

mkdirs: $(OBJDIR)

endif

$(OBJDIR):

	@if test ! -d $@; then \

		mkdir -p $@; \

	fi;

ifeq ($(VOMT), lib)

$(BLTDIRS):

	@if test ! -d $@; then \

		mkdir -p $@; \

	fi;

$(BLTDIRD):

	@if test ! -d $@; then \

		mkdir -p $@; \

	fi;

endif

ifeq ($(VOMT), lib)

$(LIB_STATIC):$(OBJS)

	$(AR) cr $@ $(OBJDIR)/*.o $(VOSTCLIBS)

	$(RANLIB) $@

ifneq ($(VODBG), yes)

	#$(STRIP) $@

endif

$(LIB_DYNAMIC):$(OBJS)

	$(GG) $(LDFLAGS) -o $@ $(OBJDIR)/*.o -Wl,--whole-archive $(VOSTCLIBS) -Wl,--no-whole-archive $(VOTLDEPS) 

ifneq ($(VODBG), yes)

		$(STRIP) $@

endif

else

$(TARGET):$(OBJS)

	$(GG) $(LDFLAGS) -o $@ $(OBJDIR)/*.o -Wl,--whole-archive $(VOSTCLIBS) -Wl,--no-whole-archive $(VOTEDEPS)

ifneq ($(VODBG), yes)

	$(STRIP) $@

endif

endif

.SUFFIXES: .c .cpp .s .o

.c.o:

	$(VERBOSE) $(CC) $(CFLAGS) -o $(OBJDIR)/$@ -c $<

#%.c:$(OBJDIR)/%.o

#	$(VERBOSE) $(CC) $(CFLAGS) -o $@ -c $<

.cpp.o:

	$(VERBOSE) $(GG) $(CPPFLAGS) -o $(OBJDIR)/$@ -c $<

ifneq ($(VOTT), pc)

.s.o:

	$(VERBOSE) $(AS) $(ASFLAGS) -o $(OBJDIR)/$@ $<

endif

.PHONY: clean devel

clean:

ifeq ($(VOMT), lib)

	-rm -fr $(OBJDIR) .*.sw* $(VOTARGET).*

else

	-rm -fr $(OBJDIR) .*.sw* $(VOTARGET)

endif

devel:

	cp -a $(LIB_STATIC) $(BLTDIRS)

	cp -a $(LIB_DYNAMIC) $(BLTDIRD)