Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Repo status for build
s.shelnutt@funtux ~/Android/heroc/cm10 $ repo status
project ICS_Fixes/ branch jellybean
project bionic/ branch playground
-m libstdc++/Android.mk
-m libthread_db/Android.mk
-m linker/Android.mk
project build/ branch playground
-m core/user_tags.mk
-m tools/rgb2565/Android.mk
-m tools/signapk/Android.mk
-m tools/zipalign/Android.mk
project dalvik/ branch playground
project device/htc/common/ branch jellybean
project device/htc/heroc/ branch jellybean
-m BoardConfig.mk
-- BoardConfig.mk~
-- recovery/recovery_ui.c~
-- recovery/recovery_ui.h
project external/aac/ (*** NO BRANCH ***)
-d Android.mk
-- Android.mk.bck
-- Android.mk~
-m libFDK/include/arm/clz_arm.h
-- libFDK/include/arm/clz_arm.h~
-m libFDK/include/arm/cplx_mul.h
-- libFDK/include/arm/cplx_mul.h~
-m libFDK/include/arm/fixmadd_arm.h
-- libFDK/include/arm/fixmadd_arm.h~
-m libFDK/include/arm/fixmul_arm.h
-- libFDK/include/arm/fixmul_arm.h~
-- libFDK/include/common_fix.h~
project external/bash/ (*** NO BRANCH ***)
-d patchlevel.h~
project external/busybox/ branch playground
project external/compiler-rt/ (*** NO BRANCH ***)
-d Android.mk
-- Android.mk.bcl
-m lib/arm/adddf3vfp.S
-m lib/arm/addsf3vfp.S
-m lib/arm/divdf3vfp.S
-m lib/arm/divsf3vfp.S
-m lib/arm/eqdf2vfp.S
-m lib/arm/eqsf2vfp.S
-m lib/arm/extendsfdf2vfp.S
-m lib/arm/fixdfsivfp.S
-m lib/arm/fixsfsivfp.S
-m lib/arm/fixunsdfsivfp.S
-m lib/arm/fixunssfsivfp.S
-m lib/arm/floatsidfvfp.S
-m lib/arm/floatsisfvfp.S
-m lib/arm/floatunssidfvfp.S
-m lib/arm/floatunssisfvfp.S
-m lib/arm/gedf2vfp.S
-m lib/arm/gesf2vfp.S
-m lib/arm/gtdf2vfp.S
-m lib/arm/gtsf2vfp.S
-m lib/arm/ledf2vfp.S
-m lib/arm/lesf2vfp.S
-m lib/arm/ltdf2vfp.S
-m lib/arm/ltsf2vfp.S
-m lib/arm/muldf3vfp.S
-m lib/arm/mulsf3vfp.S
-m lib/arm/nedf2vfp.S
-m lib/arm/nesf2vfp.S
-m lib/arm/restore_vfp_d8_d15_regs.S
-m lib/arm/save_vfp_d8_d15_regs.S
-m lib/arm/subdf3vfp.S
-m lib/arm/subsf3vfp.S
-m lib/arm/truncdfsf2vfp.S
-m lib/arm/unorddf2vfp.S
-m lib/arm/unordsf2vfp.S
project external/lsof/ branch jellybean
project external/markdown/ (*** NO BRANCH ***)
-d MarkdownTest/Tests_2004/Yuri-Attributes.text~
project external/sqlite/ (*** NO BRANCH ***)
-- Android.mk
project external/srec/ (*** NO BRANCH ***)
-d audio/AudioIn/UNIX/src/Android.mk
-- audio/AudioIn/UNIX/src/Android.mk.nck
-m audio/AudioIn/UNIX/src/audioinwrapper.cpp
-d audio/test/Android.mk
-- audio/test/Android.mk.bck
-d audio/test/AudioInRecord/Android.mk
-- audio/test/AudioInRecord/Android.mk.bck
-d srec/test/SRecTestAudio/Android.mk
-- srec/test/SRecTestAudio/Android.mk.bck
project external/valgrind/ (*** NO BRANCH ***)
-m main/coregrind/m_dispatch/dispatch-arm-linux.S
project external/wireless-tools/ branch jellybean
project external/wpa_supplicant/ branch jellybean
-- keystore_get.h
project frameworks/av/ (*** NO BRANCH ***)
-m media/libstagefright/Android.mk
-- media/libstagefright/Android.mk~
-m media/libstagefright/OMXCodec.cpp
-- media/libstagefright/OMXCodec.cpp~
-m media/libstagefright/codecs/aacdec/Android.mk
-- media/libstagefright/codecs/aacdec/Android.mk~
-m media/libstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h
-- media/libstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h~
-m media/libstagefright/codecs/aacdec/fxp_mul32_arm_v5.h
-- media/libstagefright/codecs/aacdec/fxp_mul32_arm_v5.h~
-m media/libstagefright/codecs/aacenc/Android.mk
-- media/libstagefright/codecs/aacenc/Android.mk~
-m media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h
-- media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h~
-m media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.
-- media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.
project frameworks/base/ (*** NO BRANCH ***)
-- data/etc/android.hardware.audio.low_latency.xml
-- data/etc/android.hardware.camera.autofocus.xml
-- data/etc/android.hardware.camera.flash-autofocus.xml
-- data/etc/android.hardware.camera.front.xml
-- data/etc/android.hardware.camera.xml
-- data/etc/android.hardware.faketouch.multitouch.distinct.xml
-- data/etc/android.hardware.faketouch.multitouch.jazzhand.xml
-- data/etc/android.hardware.faketouch.xml
-- data/etc/android.hardware.location.gps.xml
-- data/etc/android.hardware.location.xml
-- data/etc/android.hardware.nfc.xml
-- data/etc/android.hardware.sensor.accelerometer.xml
-- data/etc/android.hardware.sensor.barometer.xml
-- data/etc/android.hardware.sensor.compass.xml
-- data/etc/android.hardware.sensor.gyroscope.xml
-- data/etc/android.hardware.sensor.light.xml
-- data/etc/android.hardware.sensor.proximity.xml
-- data/etc/android.hardware.telephony.cdma.xml
-- data/etc/android.hardware.telephony.gsm.xml
-- data/etc/android.hardware.touchscreen.multitouch.distinct.xml
-- data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml
-- data/etc/android.hardware.touchscreen.multitouch.xml
-- data/etc/android.hardware.touchscreen.xml
-- data/etc/android.hardware.usb.accessory.xml
-- data/etc/android.hardware.usb.host.xml
-- data/etc/android.hardware.wifi.direct.xml
-- data/etc/android.hardware.wifi.xml
-- data/etc/android.software.sip.voip.xml
-- data/etc/android.software.sip.xml
-- data/etc/com.tmobile.software.themes.xml
-- data/etc/handheld_core_hardware.xml
-- data/etc/platform.xml.orig
-- data/etc/tablet_core_hardware.xml
-- telephony/java/com/android/internal/telephony/CommandsInterface.java~
project frameworks/native/ branch playground
project hardware/libhardware_legacy/ (*** NO BRANCH ***)
-- audio/Android.mk~
project hardware/msm7k/ (*** NO BRANCH ***)
-m Android.mk
-m libaudio/Android.mk
-m libcopybit/Android.mk
-m libgralloc/Android.mk
-m liblights/Android.mk
-m librpc/Android.mk
-m libstagefrighthw/Android.mk
project hardware/qcom/display/ branch jellybean
project packages/apps/DSPManager/ (*** NO BRANCH ***)
-- Android.mk.bck
project packages/apps/Superuser/ branch jellybean
project packages/providers/GoogleContactsProvider/branch jellybean
project system/wlan/ti/ branch jellybean
-m sta_dk_4_0_4_32/CUDK/tiwlan_loader/tiwlan_loader.c
-m sta_dk_4_0_4_32/config/Android.mk
project vendor/TeamICS/ branch jellybean
project vendor/htc/heroc/ branch jellybean
-m proprietary/libOmxCore.so
-m proprietary/libcamera.so
-m proprietary/libgps.so
project bionic/
diff --git a/libstdc++/Android.mk b/libstdc++/Android.mk
index 8bc181f..28f1d53 100644
--- a/libstdc++/Android.mk
+++ b/libstdc++/Android.mk
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES:= \
src/typeinfo.cpp
LOCAL_MODULE:= libstdc++
+LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libstdc++_cflags)
diff --git a/libthread_db/Android.mk b/libthread_db/Android.mk
index af506ed..10eac84 100644
--- a/libthread_db/Android.mk
+++ b/libthread_db/Android.mk
@@ -10,6 +10,7 @@ LOCAL_SRC_FILES:= \
libthread_db.c
LOCAL_MODULE:= libthread_db
+LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_LIBRARY)
@@ -21,6 +22,7 @@ include $(CLEAR_VARS)
LOCAL_WHOLE_STATIC_LIBRARIES := libthread_db
LOCAL_MODULE:=libthread_db
+LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdl libc
LOCAL_ALLOW_UNDEFINED_SYMBOLS := false
LOCAL_SYSTEM_SHARED_LIBRARIES :=
diff --git a/linker/Android.mk b/linker/Android.mk
index 1ca1e86..f6f9822 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -40,6 +40,7 @@ ifeq ($(TARGET_HAVE_TEGRA_ERRATA_657451),true)
endif
LOCAL_MODULE:= linker
+LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_LIBRARIES := libc_nomalloc
project build/
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 4beb54a..152d24b 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -306,7 +306,6 @@ GRANDFATHERED_USER_MODULES += \
libsqlite3_android \
libSR_AcousticModels \
libSR_AcousticState \
- libSR_AudioIn \
libSR_Core \
libSR_EventLog \
libSR_G2P \
@@ -496,3 +495,5 @@ GRANDFATHERED_USER_MODULES += \
wpa_supplicant \
yuv420sp2rgb \
zipalign
+
+# libSR_AudioIn \
diff --git a/tools/rgb2565/Android.mk b/tools/rgb2565/Android.mk
index 189584d..d053bf0 100644
--- a/tools/rgb2565/Android.mk
+++ b/tools/rgb2565/Android.mk
@@ -13,5 +13,6 @@ LOCAL_SRC_FILES := to565.c
LOCAL_CFLAGS += -O2 -Wall -Wno-unused-parameter
LOCAL_MODULE := rgb2565
+LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/signapk/Android.mk b/tools/signapk/Android.mk
index b2de21c..bd79c88 100644
--- a/tools/signapk/Android.mk
+++ b/tools/signapk/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := signapk
LOCAL_SRC_FILES := SignApk.java
LOCAL_JAR_MANIFEST := SignApk.mf
+LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_JAVA_LIBRARY)
ifeq ($(TARGET_BUILD_APPS),)
diff --git a/tools/zipalign/Android.mk b/tools/zipalign/Android.mk
index 9763bd2..307a081 100644
--- a/tools/zipalign/Android.mk
+++ b/tools/zipalign/Android.mk
@@ -29,6 +29,7 @@ LOCAL_LDLIBS += -lz
endif
LOCAL_MODULE := zipalign
+LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_EXECUTABLE)
project external/aac/
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index f804089..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-aacdec_sources := $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp)
-aacdec_sources := $(aacdec_sources:$(LOCAL_PATH)/libAACdec/src/%=%)
-
-aacenc_sources := $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp)
-aacenc_sources := $(aacenc_sources:$(LOCAL_PATH)/libAACenc/src/%=%)
-
-pcmutils_sources := $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp)
-pcmutils_sources := $(pcmutils_sources:$(LOCAL_PATH)/libPCMutils/src/%=%)
-
-fdk_sources := $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp)
-fdk_sources := $(fdk_sources:$(LOCAL_PATH)/libFDK/src/%=%)
-
-sys_sources := $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp)
-sys_sources := $(sys_sources:$(LOCAL_PATH)/libSYS/src/%=%)
-
-mpegtpdec_sources := $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp)
-mpegtpdec_sources := $(mpegtpdec_sources:$(LOCAL_PATH)/libMpegTPDec/src/%=%)
-
-mpegtpenc_sources := $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp)
-mpegtpenc_sources := $(mpegtpenc_sources:$(LOCAL_PATH)/libMpegTPEnc/src/%=%)
-
-sbrdec_sources := $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp)
-sbrdec_sources := $(sbrdec_sources:$(LOCAL_PATH)/libSBRdec/src/%=%)
-
-sbrenc_sources := $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp)
-sbrenc_sources := $(sbrenc_sources:$(LOCAL_PATH)/libSBRenc/src/%=%)
-
-LOCAL_SRC_FILES := \
- $(aacdec_sources:%=libAACdec/src/%) \
- $(aacenc_sources:%=libAACenc/src/%) \
- $(pcmutils_sources:%=libPCMutils/src/%) \
- $(fdk_sources:%=libFDK/src/%) \
- $(sys_sources:%=libSYS/src/%) \
- $(mpegtpdec_sources:%=libMpegTPDec/src/%) \
- $(mpegtpenc_sources:%=libMpegTPEnc/src/%) \
- $(sbrdec_sources:%=libSBRdec/src/%) \
- $(sbrenc_sources:%=libSBRenc/src/%)
-
-LOCAL_CFLAGS := -DANDROID
-LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/libAACdec/include \
- $(LOCAL_PATH)/libAACenc/include \
- $(LOCAL_PATH)/libPCMutils/include \
- $(LOCAL_PATH)/libFDK/include \
- $(LOCAL_PATH)/libSYS/include \
- $(LOCAL_PATH)/libMpegTPDec/include \
- $(LOCAL_PATH)/libMpegTPEnc/include \
- $(LOCAL_PATH)/libSBRdec/include \
- $(LOCAL_PATH)/libSBRenc/include
-
-LOCAL_MODULE:= libFraunhoferAAC
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libFDK/include/arm/clz_arm.h b/libFDK/include/arm/clz_arm.h
index b33b800..3bdc199 100644
--- a/libFDK/include/arm/clz_arm.h
+++ b/libFDK/include/arm/clz_arm.h
@@ -99,7 +99,7 @@ amm-info@iis.fraunhofer.de
inline INT fixnormz_D(LONG value)
{
INT result;
- asm("clz %0, %1 ": "=r"(result) : "r"(value) );
+ asm(" .arch armv7\n" "clz %0, %1 ": "=r"(result) : "r"(value) );
return result;
}
diff --git a/libFDK/include/arm/cplx_mul.h b/libFDK/include/arm/cplx_mul.h
index 2416f98..d841d21 100644
--- a/libFDK/include/arm/cplx_mul.h
+++ b/libFDK/include/arm/cplx_mul.h
@@ -89,7 +89,14 @@ amm-info@iis.fraunhofer.de
******************************************************************************/
#if defined(__arm__) && defined(__GNUC__) /* cppp replaced: elif */
-
+__asm (
+ // On Android gcc compiler, the clz instruction is not supported with a
+ // target smaller than armv7, despite it being legal for armv5+.
+" .arch armv7-a\n"
+//" clz %0, %1 \n"
+//"=r" (leading_zeroes)
+//"r" (data)
+);
#if defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_6__)
#define FUNCTION_cplxMultDiv2_32x16
#define FUNCTION_cplxMultDiv2_32x16X2
@@ -110,7 +117,7 @@ inline void cplxMultDiv2( FIXP_DBL *c_Re,
LONG tmp1,tmp2;
const LONG w = wpk.w;
- asm("smulwt %0, %3, %4;\n"
+ asm(" .arch armv7\n" "smulwt %0, %3, %4;\n"
"rsb %1,%0,#0;\n"
"smlawb %0, %2, %4, %1;\n"
"smulwt %1, %2, %4;\n"
@@ -134,7 +141,7 @@ inline void cplxMultDiv2( FIXP_DBL *c_Re,
{
LONG tmp1, tmp2;
- asm("smulwb %0, %3, %5;\n" /* %7 = -a_Im * b_Im */
+ __asm__(" .arch armv7\n" "smulwb %0, %3, %5;\n" /* %7 = -a_Im * b_Im */
"rsb %1,%0,#0;\n"
"smlawb %0, %2, %4, %1;\n" /* tmp1 = a_Re * b_Re - a_Im * b_Im */
"smulwb %1, %2, %5;\n" /* %7 = a_Re * b_Im */
@@ -158,7 +165,7 @@ inline void cplxMultAddDiv2( FIXP_DBL *c_Re,
{
LONG tmp1, tmp2;
- asm("smulwb %0, %3, %5;\n"
+ asm(" .arch armv7\n" "smulwb %0, %3, %5;\n"
"rsb %1,%0,#0;\n"
"smlawb %0, %2, %4, %1;\n"
"smulwb %1, %2, %5;\n"
@@ -184,7 +191,7 @@ inline void cplxMultDiv2( FIXP_DBL *c_Re,
LONG tmp1, tmp2;
#ifdef __ARM_ARCH_6__
- asm(
+ asm(" .arch armv7\n"
"smmul %0, %2, %4;\n" /* tmp1 = a_Re * b_Re */
"smmls %0, %3, %5, %0;\n" /* tmp1 -= a_Im * b_Im */
"smmul %1, %2, %5;\n" /* tmp2 = a_Re * b_Im */
@@ -195,7 +202,7 @@ inline void cplxMultDiv2( FIXP_DBL *c_Re,
);
#else
LONG discard;
- asm(
+ asm(" .arch armv7\n"
"smull %2, %0, %7, %6;\n" /* tmp1 = -a_Im * b_Im */
"smlal %2, %0, %3, %5;\n" /* tmp1 += a_Re * b_Re */
"smull %2, %1, %3, %6;\n" /* tmp2 = a_Re * b_Im */
diff --git a/libFDK/include/arm/fixmadd_arm.h b/libFDK/include/arm/fixmadd_arm.h
index e12d211..d895860 100644
--- a/libFDK/include/arm/fixmadd_arm.h
+++ b/libFDK/include/arm/fixmadd_arm.h
@@ -100,7 +100,7 @@ amm-info@iis.fraunhofer.de
#ifdef __ARM_ARCH_6__
inline FIXP_DBL fixmadddiv2_DD (FIXP_DBL x, const FIXP_DBL a, const FIXP_DBL b) {
INT result;
- asm ("smmla %0, %1, %2, %3;\n"
+ asm (" .arch armv7\n" "smmla %0, %1, %2, %3;\n"
: "=r" (result)
: "r" (a), "r" (b), "r"(x) );
return result ;
@@ -108,7 +108,7 @@ amm-info@iis.fraunhofer.de
#define FUNCTION_fixmsubdiv2_DD
inline FIXP_DBL fixmsubdiv2_DD (FIXP_DBL x, const FIXP_DBL a, const FIXP_DBL b) {
INT result;
- asm ("smmls %0, %1, %2, %3;\n"
+ asm (" .arch armv7\n" "smmls %0, %1, %2, %3;\n"
: "=r" (result)
: "r" (a), "r" (b), "r"(x) );
return result ;
@@ -116,7 +116,7 @@ amm-info@iis.fraunhofer.de
#else /* __ARM_ARCH_6__ */
inline FIXP_DBL fixmadddiv2_DD (FIXP_DBL x, const FIXP_DBL a, const FIXP_DBL b) {
INT discard, result = x;
- asm ("smlal %0, %1, %2, %3;\n"
+ asm (" .arch armv7\n" "smlal %0, %1, %2, %3;\n"
: "=r" (discard), "+r" (result)
: "r" (a), "r" (b) );
return result ;
@@ -129,7 +129,7 @@ amm-info@iis.fraunhofer.de
inline FIXP_DBL fixmadddiv2_DS (FIXP_DBL x, const FIXP_DBL a, const FIXP_SGL b) {
INT result;
- asm("smlawb %0, %1, %2, %3 "
+ asm(" .arch armv7\n" "smlawb %0, %1, %2, %3 "
: "=r" (result)
: "r" (a), "r" (b), "r" (x) );
return result ;
diff --git a/libFDK/include/arm/fixmul_arm.h b/libFDK/include/arm/fixmul_arm.h
index d42d677..420e406 100644
--- a/libFDK/include/arm/fixmul_arm.h
+++ b/libFDK/include/arm/fixmul_arm.h
@@ -110,7 +110,7 @@ amm-info@iis.fraunhofer.de
inline INT fixmuldiv2_DD (const INT a, const INT b)
{
INT result ;
- __asm__ ("smmul %0, %1, %2" : "=r" (result)
+ __asm__ (" .arch armv7\n" "smmul %0, %1, %2" : "=r" (result)
: "r" (a), "r" (b)) ;
return result ;
}
@@ -118,7 +118,7 @@ inline INT fixmuldiv2_DD (const INT a, const INT b)
inline INT fixmuldiv2_DD (const INT a, const INT b)
{
INT discard, result ;
- __asm__ ("smull %0, %1, %2, %3" : "=&r" (discard), "=r" (result)
+ __asm__ (" .arch armv7\n" "smull %0, %1, %2, %3" : "=&r" (discard), "=r" (result)
: "r" (a), "r" (b)) ;
return result ;
}
@@ -129,7 +129,7 @@ inline INT fixmuldiv2_DD (const INT a, const INT b)
inline INT fixmuldiv2_SD (const SHORT a, const INT b)
{
INT result ;
- __asm__ ("smulwb %0, %1, %2"
+ __asm__ (" .arch armv7\n" "smulwb %0, %1, %2"
: "=r" (result)
: "r" (b), "r" (a)) ;
return result ;
project external/bash/
diff --git a/patchlevel.h~ b/patchlevel.h~
deleted file mode 100644
index aaa6ff6..0000000
--- a/patchlevel.h~
+++ /dev/null
@@ -1,30 +0,0 @@
-/* patchlevel.h -- current bash patch level */
-
-/* Copyright (C) 2001-2009 Free Software Foundation, Inc.
-
- This file is part of GNU Bash, the Bourne Again SHell.
-
- Bash is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Bash is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Bash. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#if !defined (_PATCHLEVEL_H_)
-#define _PATCHLEVEL_H_
-
-/* It's important that there be no other strings in this file that match the
- regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
- looks for to find the patch level (for the sccs version string). */
-
-#define PATCHLEVEL 37
-
-#endif /* _PATCHLEVEL_H_ */
project external/compiler-rt/
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 870d362..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# Copyright (C) 2012 The Android Open Source Project
-#
-# 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.
-#
-#
-
-LOCAL_PATH := $(call my-dir)
-
-#=====================================================================
-# Device Static Library: libbccCompilerRT
-#=====================================================================
-
-ifneq ($(TARGET_ARCH),mips)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcompiler-rt
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_CLANG := true
-LOCAL_CFLAGS := -integrated-as
-
-ifeq ($(TARGET_ARCH),arm)
- LOCAL_SRC_FILES += \
- lib/arm/adddf3vfp.S \
- lib/arm/addsf3vfp.S \
- lib/arm/divdf3vfp.S \
- lib/arm/divsf3vfp.S \
- lib/arm/eqdf2vfp.S \
- lib/arm/eqsf2vfp.S \
- lib/arm/extendsfdf2vfp.S \
- lib/arm/fixdfsivfp.S \
- lib/arm/fixsfsivfp.S \
- lib/arm/fixunsdfsivfp.S \
- lib/arm/fixunssfsivfp.S \
- lib/arm/floatsidfvfp.S \
- lib/arm/floatsisfvfp.S \
- lib/arm/floatunssidfvfp.S \
- lib/arm/floatunssisfvfp.S \
- lib/arm/gedf2vfp.S \
- lib/arm/gesf2vfp.S \
- lib/arm/gtdf2vfp.S \
- lib/arm/gtsf2vfp.S \
- lib/arm/ledf2vfp.S \
- lib/arm/lesf2vfp.S \
- lib/arm/ltdf2vfp.S \
- lib/arm/ltsf2vfp.S \
- lib/arm/muldf3vfp.S \
- lib/arm/mulsf3vfp.S \
- lib/arm/nedf2vfp.S \
- lib/arm/negdf2vfp.S \
- lib/arm/negsf2vfp.S \
- lib/arm/nesf2vfp.S \
- lib/arm/subdf3vfp.S \
- lib/arm/subsf3vfp.S \
- lib/arm/truncdfsf2vfp.S \
- lib/arm/unorddf2vfp.S \
- lib/arm/unordsf2vfp.S
-else
- ifeq ($(TARGET_ARCH),x86) # We don't support x86-64 right now
- LOCAL_SRC_FILES += \
- lib/i386/ashldi3.S \
- lib/i386/ashrdi3.S \
- lib/i386/divdi3.S \
- lib/i386/floatdidf.S \
- lib/i386/floatdisf.S \
- lib/i386/floatdixf.S \
- lib/i386/floatundidf.S \
- lib/i386/floatundisf.S \
- lib/i386/floatundixf.S \
- lib/i386/lshrdi3.S \
- lib/i386/moddi3.S \
- lib/i386/muldi3.S \
- lib/i386/udivdi3.S \
- lib/i386/umoddi3.S
- else
- $(error Unsupported TARGET_ARCH $(TARGET_ARCH))
- endif
-endif
-
-include $(BUILD_STATIC_LIBRARY)
-
-endif # ifneq($(TARGET_ARCH),mips)
-
-
-include $(LOCAL_PATH)/lib/asan/Android.mk
diff --git a/lib/arm/adddf3vfp.S b/lib/arm/adddf3vfp.S
index c90b0c2..836c708 100644
--- a/lib/arm/adddf3vfp.S
+++ b/lib/arm/adddf3vfp.S
@@ -18,8 +18,8 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__adddf3vfp)
- vmov d6, r0, r1 // move first param from r0/r1 pair into d6
- vmov d7, r2, r3 // move second param from r2/r3 pair into d7
- vadd.f64 d6, d6, d7
- vmov r0, r1, d6 // move result back to r0/r1 pair
+ mov d6, r0, r1 // move first param from r0/r1 pair into d6
+ mov d7, r2, r3 // move second param from r2/r3 pair into d7
+ add.f64 d6, d6, d7
+ mov r0, r1, d6 // move result back to r0/r1 pair
bx lr
diff --git a/lib/arm/addsf3vfp.S b/lib/arm/addsf3vfp.S
index 43653d5..da11e49 100644
--- a/lib/arm/addsf3vfp.S
+++ b/lib/arm/addsf3vfp.S
@@ -18,8 +18,8 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__addsf3vfp)
- vmov s14, r0 // move first param from r0 into float register
- vmov s15, r1 // move second param from r1 into float register
- vadd.f32 s14, s14, s15
- vmov r0, s14 // move result back to r0
+ mov s14, r0 // move first param from r0 into float register
+ mov s15, r1 // move second param from r1 into float register
+ add.f32 s14, s14, s15
+ mov r0, s14 // move result back to r0
bx lr
diff --git a/lib/arm/divdf3vfp.S b/lib/arm/divdf3vfp.S
index 52de67f..2f3b06f 100644
--- a/lib/arm/divdf3vfp.S
+++ b/lib/arm/divdf3vfp.S
@@ -18,8 +18,8 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__divdf3vfp)
- vmov d6, r0, r1 // move first param from r0/r1 pair into d6
- vmov d7, r2, r3 // move second param from r2/r3 pair into d7
- vdiv.f64 d5, d6, d7
- vmov r0, r1, d5 // move result back to r0/r1 pair
+ mov d6, r0, r1 // move first param from r0/r1 pair into d6
+ mov d7, r2, r3 // move second param from r2/r3 pair into d7
+ div.f64 d5, d6, d7
+ mov r0, r1, d5 // move result back to r0/r1 pair
bx lr
diff --git a/lib/arm/divsf3vfp.S b/lib/arm/divsf3vfp.S
index 81ba903..0cd2ab2 100644
--- a/lib/arm/divsf3vfp.S
+++ b/lib/arm/divsf3vfp.S
@@ -18,8 +18,8 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__divsf3vfp)
- vmov s14, r0 // move first param from r0 into float register
- vmov s15, r1 // move second param from r1 into float register
- vdiv.f32 s13, s14, s15
- vmov r0, s13 // move result back to r0
+ mov s14, r0 // move first param from r0 into float register
+ mov s15, r1 // move second param from r1 into float register
+ div.f32 s13, s14, s15
+ mov r0, s13 // move result back to r0
bx lr
diff --git a/lib/arm/eqdf2vfp.S b/lib/arm/eqdf2vfp.S
index c41e55a..bd9913e 100644
--- a/lib/arm/eqdf2vfp.S
+++ b/lib/arm/eqdf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__eqdf2vfp)
- vmov d6, r0, r1 // load r0/r1 pair in double register
- vmov d7, r2, r3 // load r2/r3 pair in double register
- vcmp.f64 d6, d7
- vmrs apsr_nzcv, fpscr
+ mov d6, r0, r1 // load r0/r1 pair in double register
+ mov d7, r2, r3 // load r2/r3 pair in double register
+ cmp.f64 d6, d7
+ mrs apsr_nzcv, fpscr
moveq r0, #1 // set result register to 1 if equal
movne r0, #0
bx lr
diff --git a/lib/arm/eqsf2vfp.S b/lib/arm/eqsf2vfp.S
index 730ef88..49e246a 100644
--- a/lib/arm/eqsf2vfp.S
+++ b/lib/arm/eqsf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__eqsf2vfp)
- vmov s14, r0 // move from GPR 0 to float register
- vmov s15, r1 // move from GPR 1 to float register
- vcmp.f32 s14, s15
- vmrs apsr_nzcv, fpscr
+ mov s14, r0 // move from GPR 0 to float register
+ mov s15, r1 // move from GPR 1 to float register
+ cmp.f32 s14, s15
+ mrs apsr_nzcv, fpscr
moveq r0, #1 // set result register to 1 if equal
movne r0, #0
bx lr
diff --git a/lib/arm/extendsfdf2vfp.S b/lib/arm/extendsfdf2vfp.S
index 17a146e..4d89569 100644
--- a/lib/arm/extendsfdf2vfp.S
+++ b/lib/arm/extendsfdf2vfp.S
@@ -19,7 +19,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__extendsfdf2vfp)
- vmov s15, r0 // load float register from R0
- vcvt.f64.f32 d7, s15 // convert single to double
- vmov r0, r1, d7 // return result in r0/r1 pair
+ mov s15, r0 // load float register from R0
+ cvt.f64.f32 d7, s15 // convert single to double
+ mov r0, r1, d7 // return result in r0/r1 pair
bx lr
diff --git a/lib/arm/fixdfsivfp.S b/lib/arm/fixdfsivfp.S
index b7c3299..fa258de 100644
--- a/lib/arm/fixdfsivfp.S
+++ b/lib/arm/fixdfsivfp.S
@@ -19,7 +19,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__fixdfsivfp)
- vmov d7, r0, r1 // load double register from R0/R1
- vcvt.s32.f64 s15, d7 // convert double to 32-bit int into s15
- vmov r0, s15 // move s15 to result register
+ mov d7, r0, r1 // load double register from R0/R1
+ cvt.s32.f64 s15, d7 // convert double to 32-bit int into s15
+ mov r0, s15 // move s15 to result register
bx lr
diff --git a/lib/arm/fixsfsivfp.S b/lib/arm/fixsfsivfp.S
index 1cea6a4..081e41a 100644
--- a/lib/arm/fixsfsivfp.S
+++ b/lib/arm/fixsfsivfp.S
@@ -19,7 +19,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__fixsfsivfp)
- vmov s15, r0 // load float register from R0
- vcvt.s32.f32 s15, s15 // convert single to 32-bit int into s15
- vmov r0, s15 // move s15 to result register
+ mov s15, r0 // load float register from R0
+ cvt.s32.f32 s15, s15 // convert single to 32-bit int into s15
+ mov r0, s15 // move s15 to result register
bx lr
diff --git a/lib/arm/fixunsdfsivfp.S b/lib/arm/fixunsdfsivfp.S
index 54b0359..46e7654 100644
--- a/lib/arm/fixunsdfsivfp.S
+++ b/lib/arm/fixunsdfsivfp.S
@@ -20,7 +20,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__fixunsdfsivfp)
- vmov d7, r0, r1 // load double register from R0/R1
- vcvt.u32.f64 s15, d7 // convert double to 32-bit int into s15
- vmov r0, s15 // move s15 to result register
+ mov d7, r0, r1 // load double register from R0/R1
+ cvt.u32.f64 s15, d7 // convert double to 32-bit int into s15
+ mov r0, s15 // move s15 to result register
bx lr
diff --git a/lib/arm/fixunssfsivfp.S b/lib/arm/fixunssfsivfp.S
index 12adb52..f123bda 100644
--- a/lib/arm/fixunssfsivfp.S
+++ b/lib/arm/fixunssfsivfp.S
@@ -20,7 +20,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__fixunssfsivfp)
- vmov s15, r0 // load float register from R0
- vcvt.u32.f32 s15, s15 // convert single to 32-bit unsigned into s15
- vmov r0, s15 // move s15 to result register
+ mov s15, r0 // load float register from R0
+ cvt.u32.f32 s15, s15 // convert single to 32-bit unsigned into s15
+ mov r0, s15 // move s15 to result register
bx lr
diff --git a/lib/arm/floatsidfvfp.S b/lib/arm/floatsidfvfp.S
index e6a1eb3..bdbb538 100644
--- a/lib/arm/floatsidfvfp.S
+++ b/lib/arm/floatsidfvfp.S
@@ -19,7 +19,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__floatsidfvfp)
- vmov s15, r0 // move int to float register s15
- vcvt.f64.s32 d7, s15 // convert 32-bit int in s15 to double in d7
- vmov r0, r1, d7 // move d7 to result register pair r0/r1
+ mov s15, r0 // move int to float register s15
+ cvt.f64.s32 d7, s15 // convert 32-bit int in s15 to double in d7
+ mov r0, r1, d7 // move d7 to result register pair r0/r1
bx lr
diff --git a/lib/arm/floatsisfvfp.S b/lib/arm/floatsisfvfp.S
index 0d3a24f..dafa3dc 100644
--- a/lib/arm/floatsisfvfp.S
+++ b/lib/arm/floatsisfvfp.S
@@ -19,7 +19,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__floatsisfvfp)
- vmov s15, r0 // move int to float register s15
- vcvt.f32.s32 s15, s15 // convert 32-bit int in s15 to float in s15
- vmov r0, s15 // move s15 to result register
+ mov s15, r0 // move int to float register s15
+ cvt.f32.s32 s15, s15 // convert 32-bit int in s15 to float in s15
+ mov r0, s15 // move s15 to result register
bx lr
diff --git a/lib/arm/floatunssidfvfp.S b/lib/arm/floatunssidfvfp.S
index 770b202..734d5ea 100644
--- a/lib/arm/floatunssidfvfp.S
+++ b/lib/arm/floatunssidfvfp.S
@@ -19,7 +19,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__floatunssidfvfp)
- vmov s15, r0 // move int to float register s15
- vcvt.f64.u32 d7, s15 // convert 32-bit int in s15 to double in d7
- vmov r0, r1, d7 // move d7 to result register pair r0/r1
+ mov s15, r0 // move int to float register s15
+ cvt.f64.u32 d7, s15 // convert 32-bit int in s15 to double in d7
+ mov r0, r1, d7 // move d7 to result register pair r0/r1
bx lr
diff --git a/lib/arm/floatunssisfvfp.S b/lib/arm/floatunssisfvfp.S
index 16b3ffb..1e4d15e 100644
--- a/lib/arm/floatunssisfvfp.S
+++ b/lib/arm/floatunssisfvfp.S
@@ -19,7 +19,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__floatunssisfvfp)
- vmov s15, r0 // move int to float register s15
- vcvt.f32.u32 s15, s15 // convert 32-bit int in s15 to float in s15
- vmov r0, s15 // move s15 to result register
+ mov s15, r0 // move int to float register s15
+ cvt.f32.u32 s15, s15 // convert 32-bit int in s15 to float in s15
+ mov r0, s15 // move s15 to result register
bx lr
diff --git a/lib/arm/gedf2vfp.S b/lib/arm/gedf2vfp.S
index 55603b8..deae89d 100644
--- a/lib/arm/gedf2vfp.S
+++ b/lib/arm/gedf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__gedf2vfp)
- vmov d6, r0, r1 // load r0/r1 pair in double register
- vmov d7, r2, r3 // load r2/r3 pair in double register
- vcmp.f64 d6, d7
- vmrs apsr_nzcv, fpscr
+ mov d6, r0, r1 // load r0/r1 pair in double register
+ mov d7, r2, r3 // load r2/r3 pair in double register
+ cmp.f64 d6, d7
+ mrs apsr_nzcv, fpscr
movge r0, #1 // set result register to 1 if greater than or equal
movlt r0, #0
bx lr
diff --git a/lib/arm/gesf2vfp.S b/lib/arm/gesf2vfp.S
index 02da35c..2fdc410 100644
--- a/lib/arm/gesf2vfp.S
+++ b/lib/arm/gesf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__gesf2vfp)
- vmov s14, r0 // move from GPR 0 to float register
- vmov s15, r1 // move from GPR 1 to float register
- vcmp.f32 s14, s15
- vmrs apsr_nzcv, fpscr
+ mov s14, r0 // move from GPR 0 to float register
+ mov s15, r1 // move from GPR 1 to float register
+ cmp.f32 s14, s15
+ mrs apsr_nzcv, fpscr
movge r0, #1 // set result register to 1 if greater than or equal
movlt r0, #0
bx lr
diff --git a/lib/arm/gtdf2vfp.S b/lib/arm/gtdf2vfp.S
index b5b1e14..c3f94ed 100644
--- a/lib/arm/gtdf2vfp.S
+++ b/lib/arm/gtdf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__gtdf2vfp)
- vmov d6, r0, r1 // load r0/r1 pair in double register
- vmov d7, r2, r3 // load r2/r3 pair in double register
- vcmp.f64 d6, d7
- vmrs apsr_nzcv, fpscr
+ mov d6, r0, r1 // load r0/r1 pair in double register
+ mov d7, r2, r3 // load r2/r3 pair in double register
+ cmp.f64 d6, d7
+ mrs apsr_nzcv, fpscr
movgt r0, #1 // set result register to 1 if equal
movle r0, #0
bx lr
diff --git a/lib/arm/gtsf2vfp.S b/lib/arm/gtsf2vfp.S
index 685a9ce..3d59239 100644
--- a/lib/arm/gtsf2vfp.S
+++ b/lib/arm/gtsf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__gtsf2vfp)
- vmov s14, r0 // move from GPR 0 to float register
- vmov s15, r1 // move from GPR 1 to float register
- vcmp.f32 s14, s15
- vmrs apsr_nzcv, fpscr
+ mov s14, r0 // move from GPR 0 to float register
+ mov s15, r1 // move from GPR 1 to float register
+ cmp.f32 s14, s15
+ mrs apsr_nzcv, fpscr
movgt r0, #1 // set result register to 1 if equal
movle r0, #0
bx lr
diff --git a/lib/arm/ledf2vfp.S b/lib/arm/ledf2vfp.S
index 6e140dd..fa49a7d 100644
--- a/lib/arm/ledf2vfp.S
+++ b/lib/arm/ledf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__ledf2vfp)
- vmov d6, r0, r1 // load r0/r1 pair in double register
- vmov d7, r2, r3 // load r2/r3 pair in double register
- vcmp.f64 d6, d7
- vmrs apsr_nzcv, fpscr
+ mov d6, r0, r1 // load r0/r1 pair in double register
+ mov d7, r2, r3 // load r2/r3 pair in double register
+ cmp.f64 d6, d7
+ mrs apsr_nzcv, fpscr
movls r0, #1 // set result register to 1 if equal
movhi r0, #0
bx lr
diff --git a/lib/arm/lesf2vfp.S b/lib/arm/lesf2vfp.S
index 7b28250..22e2987 100644
--- a/lib/arm/lesf2vfp.S
+++ b/lib/arm/lesf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__lesf2vfp)
- vmov s14, r0 // move from GPR 0 to float register
- vmov s15, r1 // move from GPR 1 to float register
- vcmp.f32 s14, s15
- vmrs apsr_nzcv, fpscr
+ mov s14, r0 // move from GPR 0 to float register
+ mov s15, r1 // move from GPR 1 to float register
+ cmp.f32 s14, s15
+ mrs apsr_nzcv, fpscr
movls r0, #1 // set result register to 1 if equal
movhi r0, #0
bx lr
diff --git a/lib/arm/ltdf2vfp.S b/lib/arm/ltdf2vfp.S
index a09e67a..2645552 100644
--- a/lib/arm/ltdf2vfp.S
+++ b/lib/arm/ltdf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__ltdf2vfp)
- vmov d6, r0, r1 // load r0/r1 pair in double register
- vmov d7, r2, r3 // load r2/r3 pair in double register
- vcmp.f64 d6, d7
- vmrs apsr_nzcv, fpscr
+ mov d6, r0, r1 // load r0/r1 pair in double register
+ mov d7, r2, r3 // load r2/r3 pair in double register
+ cmp.f64 d6, d7
+ mrs apsr_nzcv, fpscr
movmi r0, #1 // set result register to 1 if equal
movpl r0, #0
bx lr
diff --git a/lib/arm/ltsf2vfp.S b/lib/arm/ltsf2vfp.S
index 8c7f9a8..7e92f76 100644
--- a/lib/arm/ltsf2vfp.S
+++ b/lib/arm/ltsf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__ltsf2vfp)
- vmov s14, r0 // move from GPR 0 to float register
- vmov s15, r1 // move from GPR 1 to float register
- vcmp.f32 s14, s15
- vmrs apsr_nzcv, fpscr
+ mov s14, r0 // move from GPR 0 to float register
+ mov s15, r1 // move from GPR 1 to float register
+ cmp.f32 s14, s15
+ mrs apsr_nzcv, fpscr
movmi r0, #1 // set result register to 1 if equal
movpl r0, #0
bx lr
diff --git a/lib/arm/muldf3vfp.S b/lib/arm/muldf3vfp.S
index 838581e..46062c5 100644
--- a/lib/arm/muldf3vfp.S
+++ b/lib/arm/muldf3vfp.S
@@ -18,8 +18,8 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__muldf3vfp)
- vmov d6, r0, r1 // move first param from r0/r1 pair into d6
- vmov d7, r2, r3 // move second param from r2/r3 pair into d7
- vmul.f64 d6, d6, d7
- vmov r0, r1, d6 // move result back to r0/r1 pair
+ mov d6, r0, r1 // move first param from r0/r1 pair into d6
+ mov d7, r2, r3 // move second param from r2/r3 pair into d7
+ mul.f64 d6, d6, d7
+ mov r0, r1, d6 // move result back to r0/r1 pair
bx lr
diff --git a/lib/arm/mulsf3vfp.S b/lib/arm/mulsf3vfp.S
index ea25913..1e34cb6 100644
--- a/lib/arm/mulsf3vfp.S
+++ b/lib/arm/mulsf3vfp.S
@@ -18,8 +18,8 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__mulsf3vfp)
- vmov s14, r0 // move first param from r0 into float register
- vmov s15, r1 // move second param from r1 into float register
- vmul.f32 s13, s14, s15
- vmov r0, s13 // move result back to r0
+ mov s14, r0 // move first param from r0 into float register
+ mov s15, r1 // move second param from r1 into float register
+ mul.f32 s13, s14, s15
+ mov r0, s13 // move result back to r0
bx lr
diff --git a/lib/arm/nedf2vfp.S b/lib/arm/nedf2vfp.S
index 2167081..ecf4589 100644
--- a/lib/arm/nedf2vfp.S
+++ b/lib/arm/nedf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__nedf2vfp)
- vmov d6, r0, r1 // load r0/r1 pair in double register
- vmov d7, r2, r3 // load r2/r3 pair in double register
- vcmp.f64 d6, d7
- vmrs apsr_nzcv, fpscr
+ mov d6, r0, r1 // load r0/r1 pair in double register
+ mov d7, r2, r3 // load r2/r3 pair in double register
+ cmp.f64 d6, d7
+ mrs apsr_nzcv, fpscr
movne r0, #1 // set result register to 0 if unequal
moveq r0, #0
bx lr
diff --git a/lib/arm/nesf2vfp.S b/lib/arm/nesf2vfp.S
index fa7aa80..8583654 100644
--- a/lib/arm/nesf2vfp.S
+++ b/lib/arm/nesf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__nesf2vfp)
- vmov s14, r0 // move from GPR 0 to float register
- vmov s15, r1 // move from GPR 1 to float register
- vcmp.f32 s14, s15
- vmrs apsr_nzcv, fpscr
+ mov s14, r0 // move from GPR 0 to float register
+ mov s15, r1 // move from GPR 1 to float register
+ cmp.f32 s14, s15
+ mrs apsr_nzcv, fpscr
movne r0, #1 // set result register to 1 if unequal
moveq r0, #0
bx lr
diff --git a/lib/arm/restore_vfp_d8_d15_regs.S b/lib/arm/restore_vfp_d8_d15_regs.S
index 7f441db..56121e3 100644
--- a/lib/arm/restore_vfp_d8_d15_regs.S
+++ b/lib/arm/restore_vfp_d8_d15_regs.S
@@ -27,7 +27,7 @@
//
.align 2
DEFINE_COMPILERRT_PRIVATE_FUNCTION(__restore_vfp_d8_d15_regs)
- vldmia sp!, {d8-d15} // pop registers d8-d15 off stack
+ ldmia sp!, {d8-d15} // pop registers d8-d15 off stack
bx lr // return to prolog
diff --git a/lib/arm/save_vfp_d8_d15_regs.S b/lib/arm/save_vfp_d8_d15_regs.S
index fbd21ba..24461b2 100644
--- a/lib/arm/save_vfp_d8_d15_regs.S
+++ b/lib/arm/save_vfp_d8_d15_regs.S
@@ -27,7 +27,7 @@
//
.align 2
DEFINE_COMPILERRT_PRIVATE_FUNCTION(__save_vfp_d8_d15_regs)
- vstmdb sp!, {d8-d15} // push registers d8-d15 onto stack
+ stmdb sp!, {d8-d15} // push registers d8-d15 onto stack
bx lr // return to prolog
// tell linker it can break up file at label boundaries
diff --git a/lib/arm/subdf3vfp.S b/lib/arm/subdf3vfp.S
index 3f88baa..41b8fc3 100644
--- a/lib/arm/subdf3vfp.S
+++ b/lib/arm/subdf3vfp.S
@@ -18,8 +18,8 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__subdf3vfp)
- vmov d6, r0, r1 // move first param from r0/r1 pair into d6
- vmov d7, r2, r3 // move second param from r2/r3 pair into d7
- vsub.f64 d6, d6, d7
- vmov r0, r1, d6 // move result back to r0/r1 pair
+ mov d6, r0, r1 // move first param from r0/r1 pair into d6
+ mov d7, r2, r3 // move second param from r2/r3 pair into d7
+ sub.f64 d6, d6, d7
+ mov r0, r1, d6 // move result back to r0/r1 pair
bx lr
diff --git a/lib/arm/subsf3vfp.S b/lib/arm/subsf3vfp.S
index ed02ba9..5100606 100644
--- a/lib/arm/subsf3vfp.S
+++ b/lib/arm/subsf3vfp.S
@@ -19,8 +19,8 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__subsf3vfp)
- vmov s14, r0 // move first param from r0 into float register
- vmov s15, r1 // move second param from r1 into float register
- vsub.f32 s14, s14, s15
- vmov r0, s14 // move result back to r0
+ mov s14, r0 // move first param from r0 into float register
+ mov s15, r1 // move second param from r1 into float register
+ sub.f32 s14, s14, s15
+ mov r0, s14 // move result back to r0
bx lr
diff --git a/lib/arm/truncdfsf2vfp.S b/lib/arm/truncdfsf2vfp.S
index 371aee9..30a6d5a 100644
--- a/lib/arm/truncdfsf2vfp.S
+++ b/lib/arm/truncdfsf2vfp.S
@@ -19,7 +19,7 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__truncdfsf2vfp)
- vmov d7, r0, r1 // load double from r0/r1 pair
- vcvt.f32.f64 s15, d7 // convert double to single (trucate precision)
- vmov r0, s15 // return result in r0
+ mov d7, r0, r1 // load double from r0/r1 pair
+ cvt.f32.f64 s15, d7 // convert double to single (trucate precision)
+ mov r0, s15 // return result in r0
bx lr
diff --git a/lib/arm/unorddf2vfp.S b/lib/arm/unorddf2vfp.S
index c49e55f..2e3d478 100644
--- a/lib/arm/unorddf2vfp.S
+++ b/lib/arm/unorddf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__unorddf2vfp)
- vmov d6, r0, r1 // load r0/r1 pair in double register
- vmov d7, r2, r3 // load r2/r3 pair in double register
- vcmp.f64 d6, d7
- vmrs apsr_nzcv, fpscr
+ mov d6, r0, r1 // load r0/r1 pair in double register
+ mov d7, r2, r3 // load r2/r3 pair in double register
+ cmp.f64 d6, d7
+ mrs apsr_nzcv, fpscr
movvs r0, #1 // set result register to 1 if "overflow" (any NaNs)
movvc r0, #0
bx lr
diff --git a/lib/arm/unordsf2vfp.S b/lib/arm/unordsf2vfp.S
index 0ab27ed..1df5c16 100644
--- a/lib/arm/unordsf2vfp.S
+++ b/lib/arm/unordsf2vfp.S
@@ -19,10 +19,10 @@
.syntax unified
.align 2
DEFINE_COMPILERRT_FUNCTION(__unordsf2vfp)
- vmov s14, r0 // move from GPR 0 to float register
- vmov s15, r1 // move from GPR 1 to float register
- vcmp.f32 s14, s15
- vmrs apsr_nzcv, fpscr
+ mov s14, r0 // move from GPR 0 to float register
+ mov s15, r1 // move from GPR 1 to float register
+ cmp.f32 s14, s15
+ mrs apsr_nzcv, fpscr
movvs r0, #1 // set result register to 1 if "overflow" (any NaNs)
movvc r0, #0
bx lr
project external/markdown/
diff --git a/MarkdownTest/Tests_2004/Yuri-Attributes.text~ b/MarkdownTest/Tests_2004/Yuri-Attributes.text~
deleted file mode 100644
index ba8fecd..0000000
--- a/MarkdownTest/Tests_2004/Yuri-Attributes.text~
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Lorem ipsum {@id=lorem}
-=================================
-
-Dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua1. Ut enim ad minim veniam,
-quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
-commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
-velit esse cillum dolore eu fugiat nulla pariatur2. Excepteur sint
-occaecat cupidatat non proident, sunt in culpa qui officia deserunt
-mollit anim id est laborum.
-
-
-
- * Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore3 magna aliqua.
-
-Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
- 1. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.%G↩%@
- 2. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
-
- Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. %G↩%@
- 3. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. %G↩%@
-
project external/srec/
diff --git a/audio/AudioIn/UNIX/src/Android.mk b/audio/AudioIn/UNIX/src/Android.mk
deleted file mode 100644
index f88ef7f..0000000
--- a/audio/AudioIn/UNIX/src/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# common settings for all ASR builds, exports some variables for sub-makes
-include $(ASR_MAKE_DIR)/Makefile.defs
-
-LOCAL_SRC_FILES:= \
- audioin.c \
- audioinwrapper.cpp \
- filter.c \
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/../include \
- $(LOCAL_PATH)/../../../../portable/include \
-
-LOCAL_CFLAGS := \
-
-LOCAL_CFLAGS += \
- $(ASR_GLOBAL_DEFINES) \
- $(ASR_GLOBAL_CPPFLAGS) \
-
-LOCAL_STATIC_LIBRARIES := \
- libESR_Portable
-
-LOCAL_SHARED_LIBRARIES := \
- liblog
-
-LOCAL_MODULE:= libSR_AudioIn
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/audio/AudioIn/UNIX/src/audioinwrapper.cpp b/audio/AudioIn/UNIX/src/audioinwrapper.cpp
index 2fe6206..9d5eac0 100644
--- a/audio/AudioIn/UNIX/src/audioinwrapper.cpp
+++ b/audio/AudioIn/UNIX/src/audioinwrapper.cpp
@@ -29,6 +29,7 @@
#include <system/audio.h>
#include <media/AudioRecord.h>
#include <media/mediarecorder.h>
+#include <media/AudioTrack.h>
using namespace android;
#endif
@@ -95,17 +96,27 @@ int AudioOpen(void)
audio_data = fopen ( file_name, "w" );
#endif
// TODO: get record buffer size from hardware.
+typedef void (*callback_t)(int event, void* user, void *info);
+callback_t cbf = NULL;
+void* user = NULL;
+int notificationFrames = 0;
+int sessionId = 0;
+
record = new android::AudioRecord(
AUDIO_SOURCE_DEFAULT,
sampleRate,
AUDIO_FORMAT_PCM_16_BIT,
(numChannels > 1) ? AUDIO_CHANNEL_IN_STEREO : AUDIO_CHANNEL_IN_MONO,
8*1024,
- (android::AudioRecord::record_flags) 0);
+ (android::AudioRecord::record_flags)(0) ,
+ cbf,
+ user,
+ notificationFrames,
+ sessionId);
if (!record) return -1;
- return record->start() == NO_ERROR ? 0 : -1;
+ return record->start(android::AudioSystem::SYNC_EVENT_NONE,0) == NO_ERROR ? 0 : -1;
#endif
}
@@ -147,7 +158,7 @@ int AudioRead(short *buffer, int frame_count)
#endif
}
-int AudioSetVolume(int stream_type, int volume)
+int AudioSetVolume(audio_stream_type_t stream_type, float volume)
{
#if defined(USE_DEV_EAC_FILE)
return 0;
@@ -156,7 +167,7 @@ int AudioSetVolume(int stream_type, int volume)
#endif
}
-int AudioGetVolume(int stream_type)
+int AudioGetVolume(audio_stream_type_t stream_type)
{
#if defined(USE_DEV_EAC_FILE)
return 0;
diff --git a/audio/test/Android.mk b/audio/test/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/audio/test/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/audio/test/AudioInRecord/Android.mk b/audio/test/AudioInRecord/Android.mk
deleted file mode 100644
index 82803a0..0000000
--- a/audio/test/AudioInRecord/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# common settings for all ASR builds, exports some variables for sub-makes
-include $(ASR_MAKE_DIR)/Makefile.defs
-
-LOCAL_SRC_FILES:= \
- src/AudioInRecord.c \
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- $(ASR_ROOT_DIR)/audio/AudioIn/UNIX/include \
-
-LOCAL_CFLAGS := \
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libhardware_legacy \
- libsrec_jni \
- libSR_AudioIn \
-
-LOCAL_MODULE:= AudioInRecord
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-
-include $(BUILD_EXECUTABLE)
diff --git a/srec/test/SRecTestAudio/Android.mk b/srec/test/SRecTestAudio/Android.mk
deleted file mode 100644
index 48a3b7f..0000000
--- a/srec/test/SRecTestAudio/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# common settings for all ASR builds, exports some variables for sub-makes
-include $(ASR_MAKE_DIR)/Makefile.defs
-
-LOCAL_SRC_FILES:= \
- src/SRecTestAudio.c \
- src/srec_test_config.c \
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/src \
- $(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../include \
- $(ASR_ROOT_DIR)/shared/include \
- $(ASR_ROOT_DIR)/portable/include \
- $(ASR_ROOT_DIR)/srec/include \
- $(ASR_ROOT_DIR)/srec/cr \
- $(ASR_ROOT_DIR)/srec/EventLog/include \
- $(ASR_ROOT_DIR)/srec/Session/include \
- $(ASR_ROOT_DIR)/srec/Semproc/include \
- $(ASR_ROOT_DIR)/srec/Recognizer/include \
- $(ASR_ROOT_DIR)/srec/Grammar/include \
- $(ASR_ROOT_DIR)/srec/Nametag/include \
- $(ASR_ROOT_DIR)/srec/Vocabulary/include \
- $(ASR_ROOT_DIR)/srec/AcousticModels/include \
- $(ASR_ROOT_DIR)/srec/AcousticState/include \
- $(ASR_ROOT_DIR)/audio/AudioIn/UNIX/include \
-
-
-LOCAL_CFLAGS += \
- $(ASR_GLOBAL_DEFINES) \
- $(ASR_GLOBAL_CPPFLAGS) \
-
-LOCAL_SHARED_LIBRARIES := \
- libutils \
- libhardware_legacy \
- libsrec_jni \
- libSR_AudioIn \
-
-LOCAL_MODULE:= SRecTestAudio
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_EXECUTABLE)
project external/valgrind/
diff --git a/main/coregrind/m_dispatch/dispatch-arm-linux.S b/main/coregrind/m_dispatch/dispatch-arm-linux.S
index 9e23349..2be4ccf 100644
--- a/main/coregrind/m_dispatch/dispatch-arm-linux.S
+++ b/main/coregrind/m_dispatch/dispatch-arm-linux.S
@@ -85,10 +85,10 @@ VG_(run_innerloop__dispatch_unprofiled):
modified guest state ptr */
/* Has the guest state pointer been messed with? If yes, exit. */
- movw r3, #:lower16:VG_(dispatch_ctr)
+ //movw r3, #:lower16:VG_(dispatch_ctr)
tst r8, #1
- movt r3, #:upper16:VG_(dispatch_ctr)
+ //movt r3, #:upper16:VG_(dispatch_ctr)
bne gsp_changed
@@ -106,11 +106,11 @@ VG_(run_innerloop__dispatch_unprofiled):
/* try a fast lookup in the translation cache */
// r0 = next guest, r1,r2,r3,r4 scratch
- movw r1, #VG_TT_FAST_MASK // r1 = VG_TT_FAST_MASK
- movw r4, #:lower16:VG_(tt_fast)
+ //movw r1, #VG_TT_FAST_MASK // r1 = VG_TT_FAST_MASK
+ //movw r4, #:lower16:VG_(tt_fast)
and r2, r1, r0, LSR #1 // r2 = entry #
- movt r4, #:upper16:VG_(tt_fast) // r4 = &VG_(tt_fast)
+ //movt r4, #:upper16:VG_(tt_fast) // r4 = &VG_(tt_fast)
add r1, r4, r2, LSL #3 // r1 = &tt_fast[entry#]
@@ -141,10 +141,10 @@ VG_(run_innerloop__dispatch_profiled):
modified guest state ptr */
/* Has the guest state pointer been messed with? If yes, exit. */
- movw r3, #:lower16:VG_(dispatch_ctr)
+ //movw r3, #:lower16:VG_(dispatch_ctr)
tst r8, #1
- movt r3, #:upper16:VG_(dispatch_ctr)
+ //movt r3, #:upper16:VG_(dispatch_ctr)
bne gsp_changed
@@ -162,11 +162,11 @@ VG_(run_innerloop__dispatch_profiled):
/* try a fast lookup in the translation cache */
// r0 = next guest, r1,r2,r3,r4 scratch
- movw r1, #VG_TT_FAST_MASK // r1 = VG_TT_FAST_MASK
- movw r4, #:lower16:VG_(tt_fast)
+ //movw r1, #VG_TT_FAST_MASK // r1 = VG_TT_FAST_MASK
+ //movw r4, #:lower16:VG_(tt_fast)
and r2, r1, r0, LSR #1 // r2 = entry #
- movt r4, #:upper16:VG_(tt_fast) // r4 = &VG_(tt_fast)
+ //movt r4, #:upper16:VG_(tt_fast) // r4 = &VG_(tt_fast)
add r1, r4, r2, LSL #3 // r1 = &tt_fast[entry#]
@@ -181,8 +181,8 @@ VG_(run_innerloop__dispatch_profiled):
// LIVE: r5, r8; all others dead
/* increment bb profile counter */
- movw r0, #:lower16:VG_(tt_fastN)
- movt r0, #:upper16:VG_(tt_fastN) // r0 = &tt_fastN[0]
+ //movw r0, #:lower16:VG_(tt_fastN)
+ //movt r0, #:upper16:VG_(tt_fastN) // r0 = &tt_fastN[0]
ldr r0, [r0, r2, LSL #2] // r0 = tt_fast[entry #]
ldr r3, [r0] // *r0 ++
add r3, r3, #1
project frameworks/av/
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 8ad1cb9..ad2f749 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -88,7 +88,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \
libstagefright_color_conversion \
- libstagefright_aacenc \
libstagefright_matroska \
libstagefright_timedtext \
libvpx \
@@ -96,6 +95,7 @@ LOCAL_STATIC_LIBRARIES := \
libstagefright_httplive \
libstagefright_id3 \
libFLAC \
+# libstagefright_aacenc \
ifneq ($(TARGET_BUILD_PDK), true)
LOCAL_STATIC_LIBRARIES += \
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index fde7ebf..26899f5 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -18,7 +18,7 @@
#define LOG_TAG "OMXCodec"
#include <utils/Log.h>
-#include "include/AACEncoder.h"
+//#include "include/AACEncoder.h"
#include "include/ESDS.h"
@@ -64,7 +64,7 @@ static sp<MediaSource> Make##name(const sp<MediaSource> &source, const sp<MetaDa
#define FACTORY_REF(name) { #name, Make##name },
-FACTORY_CREATE_ENCODER(AACEncoder)
+//FACTORY_CREATE_ENCODER(AACEncoder)
static sp<MediaSource> InstantiateSoftwareEncoder(
const char *name, const sp<MediaSource> &source,
@@ -74,7 +74,7 @@ static sp<MediaSource> InstantiateSoftwareEncoder(
sp<MediaSource> (*CreateFunc)(const sp<MediaSource> &, const sp<MetaData> &);
};
- static const FactoryInfo kFactoryInfo[] = {
+ /*static const FactoryInfo kFactoryInfo[] = {
FACTORY_REF(AACEncoder)
};
for (size_t i = 0;
@@ -82,7 +82,7 @@ static sp<MediaSource> InstantiateSoftwareEncoder(
if (!strcmp(name, kFactoryInfo[i].name)) {
return (*kFactoryInfo[i].CreateFunc)(source, meta);
}
- }
+ }*/
return NULL;
}
@@ -3453,7 +3453,7 @@ status_t OMXCodec::setAACFormat(
profile.nAudioBandWidth = 0;
profile.nFrameLength = 0;
profile.nAACtools = OMX_AUDIO_AACToolAll;
- profile.nAACERtools = OMX_AUDIO_AACERNone;
+// profile.nAACERtools = OMX_AUDIO_AACERNone;
profile.eAACProfile = (OMX_AUDIO_AACPROFILETYPE) aacProfile;
profile.eAACStreamFormat = OMX_AUDIO_AACStreamFormatMP4FF;
err = mOMX->setParameter(mNode, OMX_IndexParamAudioAac,
diff --git a/media/libstagefright/codecs/aacdec/Android.mk b/media/libstagefright/codecs/aacdec/Android.mk
index 91457c5..5c681fd 100644
--- a/media/libstagefright/codecs/aacdec/Android.mk
+++ b/media/libstagefright/codecs/aacdec/Android.mk
@@ -13,14 +13,13 @@ ifeq ($(AAC_LIBRARY), fraunhofer)
frameworks/native/include/media/openmax \
external/aac/libAACdec/include \
external/aac/libPCMutils/include \
- external/aac/libFDK/include \
external/aac/libMpegTPDec/include \
external/aac/libSBRdec/include \
external/aac/libSYS/include
-
+# external/aac/libFDK/include \
LOCAL_CFLAGS :=
- LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
+# LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
LOCAL_SHARED_LIBRARIES := \
libstagefright_omx libstagefright_foundation libutils libcutils
diff --git a/media/libstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h b/media/libstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h
index dc58976..13f4b78 100644
--- a/media/libstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h
+++ b/media/libstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h
@@ -213,7 +213,7 @@ extern "C"
register Int32 ra = (Int32)L_var1;
register Int32 rb = (Int32)L_var2;
- asm volatile(
+ asm volatile(" .arch armv7\n"
"smulwb %0, %1, %2"
: "=&r*i"(tmp)
: "r"(ra),
diff --git a/media/libstagefright/codecs/aacdec/fxp_mul32_arm_v5.h b/media/libstagefright/codecs/aacdec/fxp_mul32_arm_v5.h
index 8ab108f..d536da0 100644
--- a/media/libstagefright/codecs/aacdec/fxp_mul32_arm_v5.h
+++ b/media/libstagefright/codecs/aacdec/fxp_mul32_arm_v5.h
@@ -365,7 +365,7 @@ extern "C"
{
Int32 result64_hi;
__asm
- {
+ {" .arch armv7\n"
smulwb result64_hi, L_var1, L_var2
}
return (result64_hi);
diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk
index 1c342c8..9254844 100644
--- a/media/libstagefright/codecs/aacenc/Android.mk
+++ b/media/libstagefright/codecs/aacenc/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include frameworks/av/media/libstagefright/codecs/common/Config.mk
-AAC_LIBRARY = fraunhofer
+#AAC_LIBRARY = fraunhofer
LOCAL_SRC_FILES := basic_op/basicop2.c basic_op/oper_32b.c
@@ -108,7 +108,7 @@ ifeq ($(AAC_LIBRARY), fraunhofer)
LOCAL_CFLAGS :=
- LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
+# LOCAL_STATIC_LIBRARIES := libFraunhoferAAC
LOCAL_SHARED_LIBRARIES := \
libstagefright_omx libstagefright_foundation libutils
diff --git a/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h b/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h
index c800a2e..2fd5040 100644
--- a/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h
+++ b/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h
@@ -232,7 +232,7 @@ extern "C"
{
int32 L_mult;
__asm
- {
+ {" .arch armv7\n"
smulwb L_mult, L_var1, L_var2
}
diff --git a/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.h b/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.h
index 741b584..c691106 100644
--- a/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.h
+++ b/media/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.h
@@ -295,7 +295,7 @@ extern "C"
register int32 ra = (int32)L_var1;
register int32 rb = (int32)L_var2;
- asm volatile(
+ asm volatile(" .arch armv7\n"
"smulwb %0, %1, %2"
: "=&r*i"(tmp)
: "r"(ra),
project hardware/msm7k/
diff --git a/Android.mk b/Android.mk
index 9b59dee..44fd5f0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
#
common_msm_dirs := libcopybit liblights libopencorehw librpc libstagefrighthw
-msm7k_dirs := $(common_msm_dirs) boot libgralloc libaudio
+msm7k_dirs := $(common_msm_dirs) boot libgralloc #libaudio
qsd8k_dirs := $(common_msm_dirs) libgralloc-qsd8k libaudio-qsd8k dspcrashd
msm7x30_dirs := liblights libgralloc-qsd8k librpc libaudio-qdsp5v2
diff --git a/libaudio/Android.mk b/libaudio/Android.mk
index eb56883..548a984 100644
--- a/libaudio/Android.mk
+++ b/libaudio/Android.mk
@@ -16,6 +16,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := libaudiopolicybase
LOCAL_MODULE:= libaudiopolicy
+LOCAL_MODULE_TAGS := optional
ifeq ($(BOARD_HAVE_BLUETOOTH),true)
LOCAL_CFLAGS += -DWITH_A2DP
@@ -27,6 +28,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libaudio
+LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := \
libcutils \
@@ -42,7 +44,7 @@ LOCAL_CFLAGS += -fno-short-enums
LOCAL_STATIC_LIBRARIES += libaudiointerface
ifeq ($(BOARD_HAVE_BLUETOOTH),true)
- LOCAL_SHARED_LIBRARIES += liba2dp
+ LOCAL_CFLAGS += -DWITH_A2DP
endif
include $(BUILD_SHARED_LIBRARY)
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk
index 2989690..0ae5f7c 100644
--- a/libcopybit/Android.mk
+++ b/libcopybit/Android.mk
@@ -22,6 +22,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := copybit.cpp
LOCAL_MODULE := copybit.msm7k
LOCAL_C_INCLUDES += hardware/msm7k/libgralloc
@@ -34,6 +35,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := copybit.cpp
LOCAL_MODULE := copybit.qsd8k
LOCAL_C_INCLUDES += hardware/libhardware/modules/gralloc
diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
index ea15c13..fb6c3c5 100644
--- a/libgralloc/Android.mk
+++ b/libgralloc/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_SHARED_LIBRARIES := liblog libcutils
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \
allocator.cpp \
diff --git a/liblights/Android.mk b/liblights/Android.mk
index 2f6bd31..f9fc3be 100644
--- a/liblights/Android.mk
+++ b/liblights/Android.mk
@@ -27,4 +27,6 @@ LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE_TAGS := optional
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/librpc/Android.mk b/librpc/Android.mk
index 85e19fd..555d66c 100644
--- a/librpc/Android.mk
+++ b/librpc/Android.mk
@@ -22,6 +22,7 @@ LOCAL_COPY_HEADERS:= \
rpc/xdr.h
LOCAL_MODULE:= librpc
+LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_LIBRARY)
@@ -30,4 +31,5 @@ LOCAL_MODULE := librpc
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_STATIC_LIBRARIES := libpower
LOCAL_WHOLE_STATIC_LIBRARIES := librpc
+LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 1d41d35..446b31e 100644
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -34,6 +34,7 @@ LOCAL_SHARED_LIBRARIES := \
libui \
LOCAL_MODULE := libstagefrighthw
+LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
project system/wlan/ti/
diff --git a/sta_dk_4_0_4_32/CUDK/tiwlan_loader/tiwlan_loader.c b/sta_dk_4_0_4_32/CUDK/tiwlan_loader/tiwlan_loader.c
index f4c1377..f5dd4b3 100644
--- a/sta_dk_4_0_4_32/CUDK/tiwlan_loader/tiwlan_loader.c
+++ b/sta_dk_4_0_4_32/CUDK/tiwlan_loader/tiwlan_loader.c
@@ -70,7 +70,7 @@
#ifdef ENABLE_LOG_ERROR
#define print_error(fmt, args...) \
- { LOGE(fmt , ## args); }
+ { ALOGE(fmt , ## args); }
#else
#define print_error(fmt, args...) \
do { } while (0)
@@ -78,7 +78,7 @@
#ifdef ENABLE_LOG_DEBUG
#define print_debug(fmt, args...) \
- { LOGD(fmt , ## args); }
+ { ALOGD(fmt , ## args); }
#else
#define print_debug(fmt, args...) \
do { } while (0)
@@ -86,7 +86,7 @@
#ifdef ENABLE_LOG_INFO
#define print_info(fmt, args...) \
- { LOGI(fmt , ## args); }
+ { ALOGI(fmt , ## args); }
#else
#define print_info(fmt, args...) \
do { } while (0)
diff --git a/sta_dk_4_0_4_32/config/Android.mk b/sta_dk_4_0_4_32/config/Android.mk
index 2142b17..75633bc 100644
--- a/sta_dk_4_0_4_32/config/Android.mk
+++ b/sta_dk_4_0_4_32/config/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := wpa_supplicant.conf
-LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
LOCAL_SRC_FILES := $(LOCAL_MODULE)
project vendor/htc/heroc/
diff --git a/proprietary/libOmxCore.so b/proprietary/libOmxCore.so
index 59be52a..921c370 100644
Binary files a/proprietary/libOmxCore.so and b/proprietary/libOmxCore.so differ
diff --git a/proprietary/libcamera.so b/proprietary/libcamera.so
index 3254cd7..2355bfa 100644
Binary files a/proprietary/libcamera.so and b/proprietary/libcamera.so differ
diff --git a/proprietary/libgps.so b/proprietary/libgps.so
index b7655b9..54fca25 100644
Binary files a/proprietary/libgps.so and b/proprietary/libgps.so differ
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.