summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2014-04-15 23:36:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-15 23:36:30 +0000
commit4845b69f70ff457be8d8908f6eb61e2af67e00d3 (patch)
tree7f46562420cfe584c61092c7c6ea154a6828481c /libvideoeditor
parent3d90809974f22cd9afb905f62abe42955faa85f2 (diff)
parentd4a3cae8cc4cf924925ae57723e61c89f6c4fd51 (diff)
downloadframeworks_av-4845b69f70ff457be8d8908f6eb61e2af67e00d3.zip
frameworks_av-4845b69f70ff457be8d8908f6eb61e2af67e00d3.tar.gz
frameworks_av-4845b69f70ff457be8d8908f6eb61e2af67e00d3.tar.bz2
am d4a3cae8: am 1df2557a: Merge "Remove code markers"
* commit 'd4a3cae8cc4cf924925ae57723e61c89f6c4fd51': Remove code markers
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/vss/common/inc/marker.h78
1 files changed, 0 insertions, 78 deletions
diff --git a/libvideoeditor/vss/common/inc/marker.h b/libvideoeditor/vss/common/inc/marker.h
deleted file mode 100755
index 83cade0..0000000
--- a/libvideoeditor/vss/common/inc/marker.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011 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.
- */
-#ifndef MARKER_H
-#define MARKER_H
-
-#define ADD_CODE_MARKER_FUN(m_condition) \
- if ( !(m_condition) ) \
- { \
- __asm__ volatile ( \
- ".word 0x21614062\n\t" /* '!a@b' */ \
- ".word 0x47712543\n\t" /* 'Gq%C' */ \
- ".word 0x5F5F5F43\n\t" /* '___C' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x245F5F5F" /* '$___' */ \
- ); \
- }
-
-#define ADD_TEXT_MARKER_FUN(m_condition) \
- if ( !(m_condition) ) \
- { \
- __asm__ volatile ( \
- ".word 0x21614062\n\t" /* '!a@b' */ \
- ".word 0x47712543\n\t" /* 'Gq%C' */ \
- ".word 0x5F5F5F54\n\t" /* '___T' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x5F5F5F5F\n\t" /* '____' */ \
- ".word 0x245F5F5F" /* '$___' */ \
- ); \
- }
-
-#endif