LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev

Browse Source 
* commit '14c5da2f86fd8c59f961e6675eeeb4af299a0e18':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
This commit is contained in:
Konstantinos Menychtas
2015-08-07 23:13:15 +00:00
committed by Android Git Automerger
parent 6bf2b78e70 14c5da2f86
commit 0f528e4f0d
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-img/images_arm64-v8a_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=2 Pkg.Revision=4
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=${TARGET_CPU_ABI} SystemImage.Abi=${TARGET_CPU_ABI}

2
sys-img/images_armeabi-v7a_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=2 Pkg.Revision=4
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=armeabi-v7a SystemImage.Abi=armeabi-v7a

2
sys-img/images_armeabi_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=2 Pkg.Revision=4
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=armeabi SystemImage.Abi=armeabi

2
sys-img/images_mips_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=2 Pkg.Revision=4
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=mips SystemImage.Abi=mips

2
sys-img/images_x86_64_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=2 Pkg.Revision=4
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=${TARGET_CPU_ABI} SystemImage.Abi=${TARGET_CPU_ABI}

2
sys-img/images_x86_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=2 Pkg.Revision=4
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=${TARGET_CPU_ABI} SystemImage.Abi=${TARGET_CPU_ABI}