Cherry-pick 7fb4cc from master. do not merge.
Build SDK with the new location for the system image. Change-Id: Ic632d4ef87171fd4ed3e1a5bed9693fb402065c0
This commit is contained in:
@@ -15,4 +15,7 @@
|
||||
#
|
||||
|
||||
# Copy the ARMv7 specific kernel image to .../kernel-qemu
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu-armv7 platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu-armv7 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
|
||||
|
||||
# version files for the SDK updater, from development.git
|
||||
development/sdk/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
|
||||
|
||||
@@ -14,4 +14,7 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
|
||||
|
||||
# version files for the SDK updater, from development.git
|
||||
development/sdk/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
|
||||
|
||||
@@ -14,4 +14,7 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
|
||||
|
||||
# version files for the SDK updater, from development.git
|
||||
development/sdk/images_x86_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
|
||||
|
||||
@@ -54,7 +54,7 @@ development/sdk/plat_tools_source.properties platform-tools/source.properties
|
||||
# Platform Component
|
||||
##############################################################################
|
||||
|
||||
# version files for the SDK updater, from sdk.git
|
||||
# version files for the SDK updater, from development.git
|
||||
development/sdk/platform_source.properties platforms/${PLATFORM_NAME}/source.properties
|
||||
|
||||
# copy build prop from out/.../sdk/
|
||||
@@ -71,14 +71,6 @@ frameworks/base/libs/rs/scriptc platforms/${PLATFORM_NAME}/renderscript/include
|
||||
external/clang/lib/Headers platforms/${PLATFORM_NAME}/renderscript/clang-include
|
||||
external/clang/LICENSE.TXT platforms/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT
|
||||
|
||||
# System images + Kernel
|
||||
system.img platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/system.img
|
||||
ramdisk.img platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/ramdisk.img
|
||||
userdata.img platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/userdata.img
|
||||
system/build.prop platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/build.prop
|
||||
|
||||
# Note: the kernel image is handled by sdk-android-<abi>.atree now.
|
||||
|
||||
# emulator skins from sdk.git
|
||||
development/tools/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA
|
||||
development/tools/emulator/skins/WQVGA432 platforms/${PLATFORM_NAME}/skins/WQVGA432
|
||||
@@ -121,6 +113,18 @@ sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt
|
||||
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/data/NOTICE.txt
|
||||
sdk/files/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/skins/NOTICE.txt
|
||||
|
||||
##############################################################################
|
||||
# System image Component
|
||||
##############################################################################
|
||||
|
||||
# System images + Kernel
|
||||
system.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/system.img
|
||||
ramdisk.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/ramdisk.img
|
||||
userdata.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/userdata.img
|
||||
system/build.prop system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/build.prop
|
||||
|
||||
# Note: the kernel image is handled by sdk-android-<abi>.atree now.
|
||||
|
||||
##############################################################################
|
||||
# Docs Component
|
||||
##############################################################################
|
||||
|
||||
7
sdk/images_armeabi-v7a_source.properties
Normal file
7
sdk/images_armeabi-v7a_source.properties
Normal file
@@ -0,0 +1,7 @@
|
||||
Pkg.Desc=Android SDK Platform 4.0
|
||||
Pkg.UserSrc=false
|
||||
Platform.Version=4.0
|
||||
Pkg.Revision=1
|
||||
AndroidVersion.ApiLevel=14
|
||||
SystemImage.Abi=armeabi-v7a
|
||||
#AndroidVersion.CodeName=
|
||||
7
sdk/images_armeabi_source.properties
Normal file
7
sdk/images_armeabi_source.properties
Normal file
@@ -0,0 +1,7 @@
|
||||
Pkg.Desc=Android SDK Platform 4.0
|
||||
Pkg.UserSrc=false
|
||||
Platform.Version=4.0
|
||||
Pkg.Revision=1
|
||||
AndroidVersion.ApiLevel=14
|
||||
SystemImage.Abi=armeabi
|
||||
#AndroidVersion.CodeName=
|
||||
7
sdk/images_x86_source.properties
Normal file
7
sdk/images_x86_source.properties
Normal file
@@ -0,0 +1,7 @@
|
||||
Pkg.Desc=Android SDK Platform 4.0
|
||||
Pkg.UserSrc=false
|
||||
Platform.Version=4.0
|
||||
Pkg.Revision=1
|
||||
AndroidVersion.ApiLevel=14
|
||||
SystemImage.Abi=x86
|
||||
#AndroidVersion.CodeName=
|
||||
Reference in New Issue
Block a user