Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • begeekmyfriend/yasea
1 result
Show changes
Commits on Source (2)
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 25 compileSdkVersion 26
buildToolsVersion "25.0.2" buildToolsVersion "26.0.2"
defaultConfig { defaultConfig {
applicationId "net.ossrs.yasea.demo" applicationId "net.ossrs.yasea.demo"
minSdkVersion 16 minSdkVersion 21
targetSdkVersion 22 targetSdkVersion 22
versionCode 1 versionCode 1
versionName "1.9" versionName "1.9"
ndk { ndk {
abiFilters "armeabi-v7a", "x86" abiFilters "armeabi-v7a", "arm64-v8a", "x86"
} }
} }
buildTypes { buildTypes {
Loading
@@ -23,8 +23,8 @@ android {
Loading
@@ -23,8 +23,8 @@ android {
} }
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libx264.libs', include: ['*.jar'])
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.android.support:appcompat-v7:26.1.0'
compile project(path: ':library') compile project(path: ':library')
} }
Loading
@@ -3,9 +3,10 @@
Loading
@@ -3,9 +3,10 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
Loading
@@ -15,6 +16,7 @@ buildscript {
Loading
@@ -15,6 +16,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
} }
} }
Loading
Loading
apply plugin: 'com.android.library' // Top-level build file where you can add configuration options common to all sub-projects/modules.
android { buildscript {
compileSdkVersion 25 repositories {
buildToolsVersion "25.0.2" jcenter()
google()
defaultConfig {
minSdkVersion 16
targetSdkVersion 22
versionCode 1
versionName "1.9"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk {
abiFilters "armeabi-v7a", "x86"
}
} }
buildTypes { dependencies {
release { classpath 'com.android.tools.build:gradle:3.0.0'
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' // NOTE: Do not place your application dependencies here; they belong
} // in the individual module build.gradle files
} }
externalNativeBuild { }
ndkBuild {
path 'src/main/cpp/Android.mk' allprojects {
} repositories {
jcenter()
google()
} }
} }
dependencies { task clean(type: Delete) {
compile fileTree(dir: 'libs', include: ['*.jar']) delete rootProject.buildDir
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
testCompile 'junit:junit:4.12'
} }
APP_ABI := armeabi-v7a x86 APP_ABI := armeabi-v7a arm64-v8a x86
APP_PLATFORM := android-19 APP_PLATFORM := android-21
Loading
@@ -8,7 +8,5 @@ LOCAL_CFLAGS :=
Loading
@@ -8,7 +8,5 @@ LOCAL_CFLAGS :=
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libyuv/include $(LOCAL_PATH)/../libx264 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libyuv/include $(LOCAL_PATH)/../libx264
LOCAL_STATIC_LIBRARIES := libx264 LOCAL_STATIC_LIBRARIES := libx264
LOCAL_SHARED_LIBRARIES := libyuv LOCAL_SHARED_LIBRARIES := libyuv
LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
   
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
Loading
@@ -7,6 +7,10 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
Loading
@@ -7,6 +7,10 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_SRC_FILES := libs/armeabi-v7a/libx264.a LOCAL_SRC_FILES := libs/armeabi-v7a/libx264.a
endif endif
   
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
LOCAL_SRC_FILES := libs/arm64-v8a/libx264.a
endif
ifeq ($(TARGET_ARCH_ABI),x86) ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_SRC_FILES := libs/x86/libx264.a LOCAL_SRC_FILES := libs/x86/libx264.a
endif endif
Loading
Loading
#!/bin/sh #!/bin/sh
   
ANDROID_NDK=$HOME/Android/Sdk/ndk-bundle ANDROID_NDK=$HOME/Android/Sdk/ndk-bundle
SYSROOT=$ANDROID_NDK/platforms/android-19/arch-arm SYSROOT=$ANDROID_NDK/platforms/android-21/arch-arm
CROSS_PREFIX=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi- CROSS_PREFIX=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
EXTRA_CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -D__ANDROID__ -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__" EXTRA_CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -D__ANDROID__ -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__"
EXTRA_LDFLAGS="-nostdlib" EXTRA_LDFLAGS="-nostdlib"
Loading
Loading
#!/bin/sh #!/bin/sh
   
ANDROID_NDK=$HOME/Android/Sdk/ndk-bundle ANDROID_NDK=$HOME/Android/Sdk/ndk-bundle
SYSROOT=$ANDROID_NDK/platforms/android-19/arch-x86 SYSROOT=$ANDROID_NDK/platforms/android-21/arch-x86
CROSS_PREFIX=$ANDROID_NDK/toolchains/x86-4.9/prebuilt/linux-x86_64/bin/i686-linux-android- CROSS_PREFIX=$ANDROID_NDK/toolchains/x86-4.9/prebuilt/linux-x86_64/bin/i686-linux-android-
EXTRA_CFLAGS="-D__ANDROID__ -D__i686__" EXTRA_CFLAGS="-D__ANDROID__ -D__i686__"
EXTRA_LDFLAGS="-nostdlib" EXTRA_LDFLAGS="-nostdlib"
Loading
Loading
No preview for this file type
No preview for this file type