diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-06-30 14:21:38 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2011-06-30 14:24:42 +0800 |
| commit | 9969866cfe5b17c6e481b90d81b011a0cece78a0 (patch) | |
| tree | 182eebee90d6238d61cf7a761f4ada86e1abc8de /libvideoeditor/osal | |
| parent | 9dd21dd09e821d24eda6af225fa173f4aa2d366c (diff) | |
| download | frameworks_av-9969866cfe5b17c6e481b90d81b011a0cece78a0.zip frameworks_av-9969866cfe5b17c6e481b90d81b011a0cece78a0.tar.gz frameworks_av-9969866cfe5b17c6e481b90d81b011a0cece78a0.tar.bz2 | |
Make line-ending consistent (unix style).
Change-Id: Id837b042952ff5d97907591f337b2222cff2c8a9
Diffstat (limited to 'libvideoeditor/osal')
| -rwxr-xr-x | libvideoeditor/osal/Android.mk | 2 | ||||
| -rwxr-xr-x | libvideoeditor/osal/src/Android.mk | 140 |
2 files changed, 71 insertions, 71 deletions
diff --git a/libvideoeditor/osal/Android.mk b/libvideoeditor/osal/Android.mk index 7ae3545..5053e7d 100755 --- a/libvideoeditor/osal/Android.mk +++ b/libvideoeditor/osal/Android.mk @@ -1 +1 @@ -include $(call all-subdir-makefiles)
+include $(call all-subdir-makefiles) diff --git a/libvideoeditor/osal/src/Android.mk b/libvideoeditor/osal/src/Android.mk index 6e1d79a..9252951 100755 --- a/libvideoeditor/osal/src/Android.mk +++ b/libvideoeditor/osal/src/Android.mk @@ -1,70 +1,70 @@ -#
-# 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.
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-#
-# libvideoeditor_osal
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= libvideoeditor_osal
-
-LOCAL_SRC_FILES:= \
- M4OSA_CharStar.c \
- M4OSA_Clock.c \
- M4OSA_FileCommon.c \
- M4OSA_FileReader.c \
- M4OSA_FileWriter.c \
- M4OSA_Mutex.c \
- M4OSA_Random.c \
- M4OSA_Semaphore.c \
- M4OSA_Thread.c \
- M4PSW_DebugTrace.c \
- M4PSW_MemoryInterface.c \
- M4PSW_Trace.c \
- LVOSA_FileReader_optim.c
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := libcutils libutils
-
-LOCAL_C_INCLUDES += \
- $(TOP)/frameworks/media/libvideoeditor/osal/inc \
-
-ifeq ($(TARGET_SIMULATOR),true)
-else
- LOCAL_SHARED_LIBRARIES += libdl
-endif
-
-# All of the shared libraries we link against.
-LOCAL_LDLIBS := \
- -lpthread -ldl
-
-LOCAL_CFLAGS += -Wno-multichar \
- -D__ANDROID__ \
- -DM4OSA_FILE_BLOCK_WITH_SEMAPHORE \
- -DUSE_STAGEFRIGHT_CODECS \
- -DUSE_STAGEFRIGHT_AUDIODEC \
- -DUSE_STAGEFRIGHT_VIDEODEC \
- -DUSE_STAGEFRIGHT_AUDIOENC \
- -DUSE_STAGEFRIGHT_VIDEOENC \
- -DUSE_STAGEFRIGHT_READERS \
- -DUSE_STAGEFRIGHT_3GPP_READER
-
-include $(BUILD_STATIC_LIBRARY)
-
+# +# 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. +# + +LOCAL_PATH:= $(call my-dir) + +# +# libvideoeditor_osal +# + +include $(CLEAR_VARS) + +LOCAL_MODULE:= libvideoeditor_osal + +LOCAL_SRC_FILES:= \ + M4OSA_CharStar.c \ + M4OSA_Clock.c \ + M4OSA_FileCommon.c \ + M4OSA_FileReader.c \ + M4OSA_FileWriter.c \ + M4OSA_Mutex.c \ + M4OSA_Random.c \ + M4OSA_Semaphore.c \ + M4OSA_Thread.c \ + M4PSW_DebugTrace.c \ + M4PSW_MemoryInterface.c \ + M4PSW_Trace.c \ + LVOSA_FileReader_optim.c + +LOCAL_MODULE_TAGS := optional + +LOCAL_SHARED_LIBRARIES := libcutils libutils + +LOCAL_C_INCLUDES += \ + $(TOP)/frameworks/media/libvideoeditor/osal/inc \ + +ifeq ($(TARGET_SIMULATOR),true) +else + LOCAL_SHARED_LIBRARIES += libdl +endif + +# All of the shared libraries we link against. +LOCAL_LDLIBS := \ + -lpthread -ldl + +LOCAL_CFLAGS += -Wno-multichar \ + -D__ANDROID__ \ + -DM4OSA_FILE_BLOCK_WITH_SEMAPHORE \ + -DUSE_STAGEFRIGHT_CODECS \ + -DUSE_STAGEFRIGHT_AUDIODEC \ + -DUSE_STAGEFRIGHT_VIDEODEC \ + -DUSE_STAGEFRIGHT_AUDIOENC \ + -DUSE_STAGEFRIGHT_VIDEOENC \ + -DUSE_STAGEFRIGHT_READERS \ + -DUSE_STAGEFRIGHT_3GPP_READER + +include $(BUILD_STATIC_LIBRARY) + |