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

Commit 1056ec04 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Fix AMRWB test util and remove useless files"

parents 7dca6f1b bc40f9d2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ int encode(
	useData.memData = (VO_PTR)(&moper);

#ifdef LINUX
	handle = dlopen("/data/local/tmp/voAMRWBEnc.so", RTLD_NOW);
	handle = dlopen("libstagefright.so", RTLD_NOW);
	if(handle == 0)
	{
		printf("open dll error......");
+12 −12
Original line number Diff line number Diff line
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_SRC_FILES := 	AMRWB_E_SAMPLE.c
LOCAL_SRC_FILES := \
    AMRWB_E_SAMPLE.c \
    ../../common/cmnMemory.c

LOCAL_SRC_FILES += 	\
	../../../Common/cmnMemory.c 

LOCAL_MODULE := TestvoAMRWBEnc
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE := AMRWBEncTest

LOCAL_ARM_MODE := arm

LOCAL_STATIC_LIBRARIES := 
LOCAL_CFLAGS := $(VO_CFLAGS)

LOCAL_SHARED_LIBRARIES := libvoAMRWBEnc
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)

+0 −56
Original line number Diff line number Diff line
#/*
# ** 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:= v6


# 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:= voAMRWBEnc_Test


# 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:=../


# please modify here to be sure to see the doit.mk
include ../../../../Tools/doit.mk 
+0 −24
Original line number Diff line number Diff line
#/*
# ** 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:=AMRWB_E_SAMPLE.o cmnMemory.o
			
# please list all directories that all source files relative with your module(.h .c .cpp) locate 
VOSRCDIR:=../ \
          ../../../../Common \
	  ../../../../Include
					
				
+0 −53
Original line number Diff line number Diff line
#/*
# ** 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.
# */

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


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


# module macros
# please append the additional macro definitions here for your module if necessary. 
ifeq ($(VOTT), v5)
VOMM:=-DARM -DASM_OPT
endif

# please specify the name of your module
VOTARGET:= libvoAMRWBEncv5


# please modify here to be sure to see the g1.mk
include ../../../../../Tools/eclair.mk 

# dependent libraries.
VODEPLIBS:=-ldl -lstdc++ -lcutils

# 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 
Loading