675d4373f8
Changes after "git merge cb3f9bd"
* git mv old Android.mk from src/ to webrtc/
* Remove old unused files in src/*.
* Modify webrtc/.gitignore to keep *.mk files.
* Copy old files from master, lost in auto-merge.
src/modules/audio_processing/test/unit_test.cc
src/modules/audio_coding/codecs/isac/fix/test/{Android.mk,kenny.c}
to webrtc, but most of the old test code do not compile with new
webrtc API and are commented out.
* Move src/modules/audio_processing/test/android/apmtest/jni/*.mk to
webrtc/... but the Android.mk files does not work.
Commented out its build target.
* Changes to Android.mk files:
* Change references of src/ to webrtc/.
* Fix include path
* Fix source file list, remove old non-existing files,
add new source files to resolve link errors.
* Add new Android.mk files to build some new static libraries
to link into current Android webrtc .so files.
* Remove unnecessary LOCAL_SHARED_LIBRARIES in Android.mk files
that build static libraries.
* Remove old unnecessary clang workarounds like
-Wno-tautological-pointer-compare
-no-integrated-as
* Fix include path of debug.pb.h in some source files.
* Add -DWEBRTC_POSIX in android-webrtc.mk
* Manually merge Android specific changes in
src/typedefs.h to webrtc/typedefs.h
* Fix trivial syntax error in scoped_ptr.h, calling static_assert.
* Use -std=c++0x in webrtc/system_wrappers/source/Android.mk
* #undef getchaar in spreadsort.hpp
* Verified and not to carry old Android hacks from src/... to webrtc/...
src/system_wrappers/source/android/cpu-features.c
src/modules/interface/module.h
src/modules/audio_coding/codecs/isac/fix/source/filters_neon.c
src/system_wrappers/source/trace_posix.cc
src/typedefs.h
More pathes from Alex Luebs:
* Use new unit test kenny.cc.
Delete old kenny.cc.
Comment out unessential code in kenny.cc to fix link error for now.
* Replace old unit test files with new ones in
webrtc/modules/audio_processing/Android.mk.
Delete old audio_processing/test/unit_test.cc.
* Fix compilation errors in
webrtc/modules/audio_processing/test/audio_processing_unittest.cc
Change-Id: I7bbf776eeb9dcfa21a82dd1f2dec378235cbbc3e
57 lines
1.5 KiB
C
57 lines
1.5 KiB
C
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
// You can download Android source at
|
|
// http://source.android.com/source/downloading.html
|
|
// Original files are in ndk/sources/android/cpufeatures
|
|
// Revision is Change-Id: I9a0629efba36a6023f05e5f092e7addcc1b7d2a9
|
|
|
|
#ifndef CPU_FEATURES_H
|
|
#define CPU_FEATURES_H
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <stdint.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
typedef enum {
|
|
ANDROID_CPU_FAMILY_UNKNOWN = 0,
|
|
ANDROID_CPU_FAMILY_ARM,
|
|
ANDROID_CPU_FAMILY_X86,
|
|
|
|
ANDROID_CPU_FAMILY_MAX /* do not remove */
|
|
|
|
} AndroidCpuFamily;
|
|
|
|
/* Return family of the device's CPU */
|
|
extern AndroidCpuFamily android_getCpuFamily(void);
|
|
|
|
enum {
|
|
ANDROID_CPU_ARM_FEATURE_ARMv7 = (1 << 0),
|
|
ANDROID_CPU_ARM_FEATURE_VFPv3 = (1 << 1),
|
|
ANDROID_CPU_ARM_FEATURE_NEON = (1 << 2),
|
|
ANDROID_CPU_ARM_FEATURE_LDREX_STREX = (1 << 3),
|
|
};
|
|
|
|
enum {
|
|
ANDROID_CPU_X86_FEATURE_SSSE3 = (1 << 0),
|
|
ANDROID_CPU_X86_FEATURE_POPCNT = (1 << 1),
|
|
ANDROID_CPU_X86_FEATURE_MOVBE = (1 << 2),
|
|
};
|
|
|
|
extern uint64_t android_getCpuFeatures(void);
|
|
|
|
/* Return the number of CPU cores detected on this device. */
|
|
extern int android_getCpuCount(void);
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* CPU_FEATURES_H */
|