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

Merge pi-dr1-dev to aosp-master

Browse Source 
Change-Id: Ida13d3ff57b5b51a997f798fcf866b1ce5e85398
This commit is contained in:
Bill Yi
2018-10-19 12:20:20 -07:00
parent d00ec44aa5 9aa8a05453
commit c6e29efb1c
9 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/sdk-android-arm64-v8a.atree
View File

@@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu prebuilts/qemu-kernel/${TARGET_ARCH}/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
# version files for the SDK updater, from development.git # version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties

2
build/sdk-android-armeabi-v7a.atree
View File

@@ -15,7 +15,7 @@
# #
# Copy the ARMv7 specific kernel image to .../kernel-qemu # Copy the ARMv7 specific kernel image to .../kernel-qemu
prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64
# version files for the SDK updater, from development.git # version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties

2
build/sdk-android-armeabi.atree
View File

@@ -15,7 +15,7 @@
# #
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64 prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu-64
# version files for the SDK updater, from development.git # version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties

4
build/sdk.atree
View File

@@ -95,7 +95,8 @@ frameworks/rs/script_api/include build-tools/${PLATFORM_NAME}/rende
external/clang/lib/Headers build-tools/${PLATFORM_NAME}/renderscript/clang-include external/clang/lib/Headers build-tools/${PLATFORM_NAME}/renderscript/clang-include
external/clang/LICENSE.TXT build-tools/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT external/clang/LICENSE.TXT build-tools/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT
prebuilts/sdk/renderscript/lib/javalib.jar build-tools/${PLATFORM_NAME}/renderscript/lib/renderscript-v8.jar prebuilts/sdk/renderscript/lib/javalib.jar build-tools/${PLATFORM_NAME}/renderscript/lib/androidx-rs.jar
prebuilts/sdk/renderscript/lib/javalib_legacy.jar build-tools/${PLATFORM_NAME}/renderscript/lib/renderscript-v8.jar
prebuilts/sdk/renderscript/lib/arm/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libc.so prebuilts/sdk/renderscript/lib/arm/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libc.so
prebuilts/sdk/renderscript/lib/arm/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libm.so prebuilts/sdk/renderscript/lib/arm/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libm.so
@@ -241,6 +242,7 @@ development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/skins/NOTIC
system-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/system.img system-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/system.img
vendor-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/vendor.img vendor-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/vendor.img
ramdisk.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/ramdisk.img ramdisk.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/ramdisk.img
device/generic/goldfish/data/etc/userdata.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/userdata.img
data/misc system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/data/misc data/misc system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/data/misc
system/build.prop system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/build.prop system/build.prop system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/build.prop

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

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK System Image Pkg.Desc=Android SDK System Image
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=3 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=arm64-v8a SystemImage.Abi=arm64-v8a

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

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK System Image Pkg.Desc=Android SDK System Image
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=3 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 System Image Pkg.Desc=Android SDK System Image
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=3 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_x86_64_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK System Image Pkg.Desc=Android SDK System Image
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=3 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=x86_64 SystemImage.Abi=x86_64

2
sys-img/images_x86_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK System Image Pkg.Desc=Android SDK System Image
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=3 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=x86 SystemImage.Abi=x86