Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.
This allows to have a different rule to generate the source.properties based on the templates and place them in a directory that depends on the current target CPU ABI. In turn this prevents the build from mixing different source.props when building different targets. Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616 Conflicts: build/sdk-android-arm64-v8a.atree build/sdk-android-x86.atree build/sdk-android-x86_64.atree sys-img/images_arm64-v8a_source.prop_template sys-img/images_x86_64_source.prop_template
This commit is contained in:
committed by
Raphael Moll
parent
71ad7c8f4e
commit
3f3f34dc0e
@@ -1,9 +0,0 @@
|
||||
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
|
||||
Pkg.UserSrc=false
|
||||
Pkg.Revision=1
|
||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||
SystemImage.Abi=armeabi-v7a
|
||||
SystemImage.GpuSupport=true
|
||||
SystemImage.TagId=default
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
|
||||
Pkg.UserSrc=false
|
||||
Pkg.Revision=1
|
||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||
SystemImage.Abi=armeabi
|
||||
SystemImage.GpuSupport=true
|
||||
SystemImage.TagId=default
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
|
||||
Pkg.UserSrc=false
|
||||
Pkg.Revision=1
|
||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||
SystemImage.Abi=mips
|
||||
SystemImage.TagId=default
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
|
||||
Pkg.UserSrc=false
|
||||
Pkg.Revision=1
|
||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||
SystemImage.Abi=x86
|
||||
SystemImage.GpuSupport=true
|
||||
SystemImage.TagId=default
|
||||
|
||||
Reference in New Issue
Block a user