Skip to content
Snippets Groups Projects
Commit d00cc02c authored by Leo Ma's avatar Leo Ma
Browse files

Upgrade AS 3.0.0


Signed-off-by: default avatarLeo Ma <begeekmyfriend@gmail.com>
parent 5e36b468
No related branches found
No related tags found
No related merge requests found
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 26
buildToolsVersion "26.0.2"
defaultConfig {
applicationId "net.ossrs.yasea.demo"
minSdkVersion 16
minSdkVersion 21
targetSdkVersion 22
versionCode 1
versionName "1.9"
ndk {
abiFilters "armeabi-v7a", "x86"
abiFilters "armeabi-v7a", "arm64-v8a", "x86"
}
}
buildTypes {
Loading
Loading
@@ -23,8 +23,8 @@ android {
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(dir: 'libx264.libs', include: ['*.jar'])
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')
}
Loading
Loading
@@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
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
// in the individual module build.gradle files
Loading
Loading
@@ -15,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}
Loading
Loading
apply plugin: 'com.android.library'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 26
buildToolsVersion "26.0.2"
defaultConfig {
minSdkVersion 16
minSdkVersion 21
targetSdkVersion 22
versionCode 1
versionName "1.9"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk {
abiFilters "armeabi-v7a", "x86"
abiFilters "armeabi-v7a", "arm64-v8a", "x86"
}
}
buildTypes {
Loading
Loading
@@ -29,10 +29,10 @@ android {
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(dir: 'libx264.libs', include: ['*.jar'])
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'
compile 'com.android.support:appcompat-v7:26.1.0'
testCompile 'junit:junit:4.12'
}
APP_ABI := armeabi-v7a x86
APP_PLATFORM := android-19
APP_ABI := armeabi-v7a arm64-v8a x86
APP_PLATFORM := android-21
Loading
Loading
@@ -8,7 +8,5 @@ LOCAL_CFLAGS :=
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libyuv/include $(LOCAL_PATH)/../libx264
LOCAL_STATIC_LIBRARIES := libx264
LOCAL_SHARED_LIBRARIES := libyuv
LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
 
include $(BUILD_SHARED_LIBRARY)
Loading
Loading
@@ -7,6 +7,10 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_SRC_FILES := libs/armeabi-v7a/libx264.a
endif
 
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
LOCAL_SRC_FILES := libs/arm64-v8a/libx264.a
endif
ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_SRC_FILES := libs/x86/libx264.a
endif
Loading
Loading
#!/bin/sh
 
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-
EXTRA_CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -D__ANDROID__ -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__"
EXTRA_LDFLAGS="-nostdlib"
Loading
Loading
#!/bin/sh
 
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-
EXTRA_CFLAGS="-D__ANDROID__ -D__i686__"
EXTRA_LDFLAGS="-nostdlib"
Loading
Loading
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment