am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
* commit '39386d450fdc2f170f5f7c94d76c38061fd5a9e0': sdk: Copy ABI-specific kernel image to platform image directory.
This commit is contained in:
committed by
Android Git Automerger
commit
eff8b9de35
18
build/sdk-android-armeabi-v7a.atree
Normal file
18
build/sdk-android-armeabi-v7a.atree
Normal file
@@ -0,0 +1,18 @@
|
||||
#
|
||||
# Copyright (C) 2011 The Android Open Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
# 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
|
||||
17
build/sdk-android-armeabi.atree
Normal file
17
build/sdk-android-armeabi.atree
Normal file
@@ -0,0 +1,17 @@
|
||||
#
|
||||
# Copyright (C) 2011 The Android Open Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
|
||||
17
build/sdk-android-x86.atree
Normal file
17
build/sdk-android-x86.atree
Normal file
@@ -0,0 +1,17 @@
|
||||
#
|
||||
# Copyright (C) 2011 The Android Open Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
|
||||
@@ -69,9 +69,10 @@ obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
|
||||
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
|
||||
prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/${TARGET_CPU_ABI}/kernel-qemu
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user