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

resolved conflicts for merge of 489fb042 to master

Browse Source 
Change-Id: I0e05d4c354053050453bcc1e8f8564758667abc3
This commit is contained in:
Xavier Ducrohet
2014-09-23 13:52:58 -07:00
parent 40893d9bdb 489fb042ba
commit ea6660e2da
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/build_tools_source.prop_template
View File

@@ -1,5 +1,3 @@
Pkg.UserSrc=false Pkg.UserSrc=false
// due to the codename this resolve to 20 instead of 21, so replace it with hardcoded version for now. Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
//Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
Pkg.Revision=21.0.0 rc1

2
sdk/platform_source.prop_template
View File

@@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Platform.Version=${PLATFORM_VERSION} Platform.Version=${PLATFORM_VERSION}
Platform.CodeName=L Platform.CodeName=L
Pkg.Revision=4 Pkg.Revision=1
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
Layoutlib.Api=12 Layoutlib.Api=12