Skip to content

I
ijkplayer

qq_25606643 / ijkplayer
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
I
ijkplayer

体验新版 GitCode，发现更多精彩内容 >>

提交 730d8c5f 编写于 作者: Z Zhang Rui
浏览文件
操作

android: remove duplicated build target

上级 aa676a46
隐藏空白更改
内联 并排
Showing with 1 addition and 215 deletion
android/compile-ijk.sh
浏览文件 @ 730d8c5f
......@@ -4,10 +4,6 @@ cd ijkmediaplayer/jni
ndk-build
cd -
cd ijkmediaplayer-armv7a/jni
ndk-build
cd -
cd ijkmediaplayer-armv5/jni
ndk-build
cd -
......
android/ijkmediaplayer-armv7a/.classpath 已删除 100644 → 0
浏览文件 @ aa676a46
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
android/ijkmediaplayer-armv7a/.project 已删除 100644 → 0
浏览文件 @ aa676a46
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ijkmediaplayer-armv7a</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
android/ijkmediaplayer-armv7a/AndroidManifest.xml 已删除 100644 → 0
浏览文件 @ aa676a46
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="tv.danmaku.ijk.media.libarmv7a" >
<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="19" />
</manifest>
\ No newline at end of file
android/ijkmediaplayer-armv7a/build.xml 已删除 100644 → 0
浏览文件 @ aa676a46
<?xml version="1.0" encoding="UTF-8"?>
<project name="ijkmediaplayer-armv7a" default="help">
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<property file="local.properties" />
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:
source.dir
The name of the source directory. Default is 'src'.
out.dir
The name of the output directory. Default is 'bin'.
For other overridable properties, look at the beginning of the rules
files in the SDK, at tools/ant/build.xml
Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.
This file is an integral part of the build system for your
application and should be checked into Version Control Systems.
-->
<property file="ant.properties" />
<!-- if sdk.dir was not set from one of the property file, then
get it from the ANDROID_HOME env var.
This must be done before we load project.properties since
the proguard config can use sdk.dir -->
<property environment="env" />
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
<isset property="env.ANDROID_HOME" />
</condition>
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
This contains project specific properties such as project target, and library
dependencies. Lower level build properties are stored in ant.properties
(or in .classpath for Eclipse projects).
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
<loadproperties srcFile="project.properties" />
<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
unless="sdk.dir"
/>
<!--
Import per project custom build rules if present at the root of the project.
This is the place to put custom intermediary targets such as:
-pre-build
-pre-compile
-post-compile (This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir})
-post-package
-post-build
-pre-clean
-->
<import file="custom_rules.xml" optional="true" />
<!-- Import the actual build file.
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<import> task.
- customize it to your needs.
- Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node)
into this file, replacing the <import> task.
- customize to your needs.
***********************
****** IMPORTANT ******
***********************
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
<!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>
android/ijkmediaplayer-armv7a/jni/Android.mk 已删除 120000 → 0
浏览文件 @ aa676a46
../../ijkmediaplayer/jni/Android.mk
\ No newline at end of file
android/ijkmediaplayer-armv7a/jni/Application.mk 已删除 100644 → 0
浏览文件 @ aa676a46
# copyright (c) 2013-2014 Zhang Rui <bbcallen@gmail.com>
#
# This file is part of ijkPlayer.
#
# ijkPlayer is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# ijkPlayer 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
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with ijkPlayer; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
APP_OPTIM := release
APP_PLATFORM := android-9
APP_ABI := armeabi-v7a
NDK_TOOLCHAIN_VERSION=4.8
APP_PIE := false
APP_STL := stlport_shared
APP_CFLAGS := -O3 -Wall -pipe \
-ffast-math \
-fstrict-aliasing -Werror=strict-aliasing \
-Wno-psabi -Wa,--noexecstack \
-DANDROID -DNDEBUG
android/ijkmediaplayer-armv7a/jni/ffmpeg 已删除 120000 → 0
浏览文件 @ aa676a46
../../ijkmediaplayer/jni/ffmpeg
\ No newline at end of file
android/ijkmediaplayer-armv7a/jni/ijkmedia 已删除 120000 → 0
浏览文件 @ aa676a46
../../../ijkmedia
\ No newline at end of file
android/ijkmediaplayer-armv7a/proguard-project.txt 已删除 100644 → 0
浏览文件 @ aa676a46
# To enable ProGuard in your project, edit project.properties
# to define the proguard.config property as described in that file.
#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in ${sdk.dir}/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the ProGuard
# include property in project.properties.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
android/ijkmediaplayer-armv7a/project.properties 已删除 100644 → 0
浏览文件 @ aa676a46
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-19
android.library=true
android/ijkmediaplayer/jni/Application.mk
浏览文件 @ 730d8c5f
......@@ -18,7 +18,7 @@
APP_OPTIM := release
APP_PLATFORM := android-9
APP_ABI := armeabi-v7a armeabi x86
APP_ABI := armeabi-v7a
NDK_TOOLCHAIN_VERSION=4.8
APP_PIE := false
APP_STL := stlport_shared
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或