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

Merge "Remove old build-tools/platform-tools implementation" am: f3901792cd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1859740

Change-Id: I6c7ffc0df732ff5ee4d2066682bc8115497e89f2
This commit is contained in:
Treehugger Robot
2021-10-16 20:30:30 +00:00
committed by Automerger Merge Worker
parent ea1db82614 f3901792cd
commit 2582be0659
10 changed files with 9 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/Android.mk
View File

@@ -3,10 +3,9 @@ LOCAL_PATH := $(call my-dir)
# ===== SDK source.property files ===== # ===== SDK source.property files =====
# Add all files to be generated from the source.prop templates to the SDK pre-requisites # Add all files to be generated from the source.prop templates to the SDK pre-requisites
sdk_props := $(patsubst \ sdk_props := $(HOST_OUT)/development/sdk/doc_source.properties \
$(TOPDIR)development/sdk/%_source.prop_template, \ $(HOST_OUT)/development/sdk/platform_source.properties \
$(HOST_OUT)/development/sdk/%_source.properties, \ $(HOST_OUT)/development/sdk/source_source.properties
$(wildcard $(TOPDIR)development/sdk/*_source.prop_template))
sample_props := $(patsubst \ sample_props := $(patsubst \
$(TOPDIR)development/samples/%_source.prop_template, \ $(TOPDIR)development/samples/%_source.prop_template, \
$(HOST_OUT)/development/samples/%_source.properties, \ $(HOST_OUT)/development/samples/%_source.properties, \
@@ -101,9 +100,6 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/classes.jar ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.base.stubs_intermediates/classes.jar
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/classes.jar ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/classes.jar
# core-lambda-stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar
# ======= Lint API XML =========== # ======= Lint API XML ===========
full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml
ALL_SDK_FILES += $(full_target) ALL_SDK_FILES += $(full_target)

49
build/product_sdk.mk
View File

@@ -1,49 +0,0 @@
#
# Copyright (C) 2012 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.
#
#
# This file is included by build.git/target/product/sdk.mk
# to define the tools that needed to be built and included
# in an SDK.
#
# If you add a dependency here, you will want to then
# modify build/tools.atree to have the new files
# packaged in the SDK.
#
# Host tools and java libraries that are parts of the SDK.
PRODUCT_HOST_PACKAGES += \
aapt \
aapt2 \
adb \
aidl \
apksigner \
bcc_compat \
bios.bin \
dexdump \
dmtracedump \
dx \
etc1tool \
hprof-conv \
libaapt2_jni \
llvm-rs-cc \
sqlite3 \
vgabios-cirrus.bin \
split-select \
zipalign
#end

24
build/sdk-android-mips.atree
View File

@@ -1,24 +0,0 @@
#
# Copyright (C) 2012 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 little-endian Mips32-fp kernel image to .../kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
# version files for the SDK updater, from development.git
development/sys-img-${TARGET_CPU_ABI}/images_mips_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
# feature control config file
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

24
build/sdk-android-mips64.atree
View File

@@ -1,24 +0,0 @@
#
# Copyright (C) 2015 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 little-endian mips64-fp kernel image to .../kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
# version files for the SDK updater, from development.git
development/sys-img-${TARGET_CPU_ABI}/images_mips64_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
# feature control config file
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

56
build/sdk-darwin-x86.atree
View File

@@ -1,56 +0,0 @@
#
# Copyright (C) 2007 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.
#
##############################################################################
# Platform Tools Component
##############################################################################
lib64/libc++.dylib strip platform-tools/lib64/libc++.dylib
##############################################################################
# Build Tools Component
##############################################################################
# Note that the build-tools sub-folder uses the platform-name as a placeholder
# at build-time. Packaging will later change that to the actual build-tools
# revision as specified in the source.properties.
lib64/libLLVM_android.dylib strip build-tools/${PLATFORM_NAME}/lib64/libLLVM_android.dylib
lib64/libbcc.dylib strip build-tools/${PLATFORM_NAME}/lib64/libbcc.dylib
lib64/libbcinfo.dylib strip build-tools/${PLATFORM_NAME}/lib64/libbcinfo.dylib
lib64/libclang_android.dylib strip build-tools/${PLATFORM_NAME}/lib64/libclang_android.dylib
lib64/libc++.dylib strip build-tools/${PLATFORM_NAME}/lib64/libc++.dylib
lib64/libaapt2_jni.dylib strip build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.dylib
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
prebuilts/sdk/tools/lld build-tools/${PLATFORM_NAME}/lld
prebuilts/sdk/tools/darwin/lld-bin/lld strip build-tools/${PLATFORM_NAME}/lld-bin/lld
prebuilts/sdk/tools/darwin/lib64/libc++.1.dylib strip build-tools/${PLATFORM_NAME}/lib64/libc++.1.dylib
prebuilts/sdk/tools/darwin/lib64/libc++abi.1.dylib strip build-tools/${PLATFORM_NAME}/lib64/libc++abi.1.dylib
##############################################################################
# Docs Component
##############################################################################
external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Authoring_Guidelines.html
external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files
external/sonivox/docs/JET_Creator_User_Manual.html docs/JetCreator/JET_Creator_User_Manual.html
external/sonivox/docs/JET_Creator_User_Manual_files docs/JetCreator/JET_Creator_User_Manual_files

171
build/sdk-windows-x86.atree
View File

@@ -1,171 +0,0 @@
#
# 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.
#
#
# These are the files that comprise the *Windows* SDK.
#
# The Windows SDK is based on the Linux one so in this file we
# need to remove Linux binaries and replace them by their
# Windows counterparts.
#
# This file only includes platform-dependent files.
# Tools-dependent files (and not tied to a specific platform)
# are controled by sdk/build/tools.windows.atree.
#
##############################################################################
# Platform Tools Component
##############################################################################
rm platform-tools/adb
rm platform-tools/fastboot
bin/adb.exe strip platform-tools/adb.exe
bin/fastboot.exe strip platform-tools/fastboot.exe
rm platform-tools/e2fsdroid
rm platform-tools/mke2fs
bin/mke2fs.exe strip platform-tools/mke2fs.exe
rm platform-tools/sload_f2fs
rm platform-tools/make_f2fs
rm platform-tools/make_f2fs_casefold
# libc++.so not needed on Windows, and that's the only thing here
rm platform-tools/lib64
bin/make_f2fs.exe strip platform-tools/make_f2fs.exe
bin/make_f2fs_casefold.exe strip platform-tools/make_f2fs_casefold.exe
lib/AdbWinUsbApi.dll platform-tools/AdbWinUsbApi.dll
lib/AdbWinApi.dll platform-tools/AdbWinApi.dll
prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32/libwinpthread-1.dll platform-tools/libwinpthread-1.dll
rm platform-tools/sqlite3
bin/sqlite3.exe strip platform-tools/sqlite3.exe
rm platform-tools/dmtracedump
bin/dmtracedump.exe strip platform-tools/dmtracedump.exe
rm platform-tools/hprof-conv
bin/hprof-conv.exe strip platform-tools/hprof-conv.exe
rm platform-tools/etc1tool
bin/etc1tool.exe strip platform-tools/etc1tool.exe
##############################################################################
# Build Tools Component
##############################################################################
# Note that the build-tools sub-folder uses the platform-name as a placeholder
# at build-time. Packaging will later change that to the actual build-tools
# revision as specified in the source.properties.
# Needed by all binaries compiled by mingw32-64
prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32/libwinpthread-1.dll strip build-tools/${PLATFORM_NAME}/libwinpthread-1.dll
rm build-tools/${PLATFORM_NAME}/aapt
bin/aapt.exe strip build-tools/${PLATFORM_NAME}/aapt.exe
rm build-tools/${PLATFORM_NAME}/aapt2
bin/aapt2.exe strip build-tools/${PLATFORM_NAME}/aapt2.exe
rm build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.so
lib/libaapt2_jni.dll strip build-tools/${PLATFORM_NAME}/libaapt2_jni.dll
# Also include a 64-bit version of libaapt2_jni.dll for use by 64-bit JVMs.
lib64/libaapt2_jni.dll strip build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.dll
# Also include the 64-bit libwinpthread-1.dll needed by libaapt2_jni.dll.
prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/bin/libwinpthread-1.dll strip build-tools/${PLATFORM_NAME}/lib64/libwinpthread-1.dll
rm build-tools/${PLATFORM_NAME}/split-select
bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split-select.exe
rm build-tools/${PLATFORM_NAME}/aidl
bin/aidl.exe strip build-tools/${PLATFORM_NAME}/aidl.exe
rm build-tools/${PLATFORM_NAME}/apksigner
tools/apksig/etc/apksigner.bat build-tools/${PLATFORM_NAME}/apksigner.bat
rm build-tools/${PLATFORM_NAME}/zipalign
bin/zipalign.exe strip build-tools/${PLATFORM_NAME}/zipalign.exe
rm build-tools/${PLATFORM_NAME}/dexdump
bin/dexdump.exe strip build-tools/${PLATFORM_NAME}/dexdump.exe
rm build-tools/${PLATFORM_NAME}/d8
prebuilts/r8/d8.bat build-tools/${PLATFORM_NAME}/d8.bat
rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
bin/llvm-rs-cc.exe strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
# libc++.so not needed on Windows.
rm build-tools/${PLATFORM_NAME}/lib64/libc++.so
rm build-tools/${PLATFORM_NAME}/lib64/libLLVM_android.so
lib/libLLVM_android.dll strip build-tools/${PLATFORM_NAME}/libLLVM_android.dll
rm build-tools/${PLATFORM_NAME}/lib64/libclang_android.so
lib/libclang_android.dll strip build-tools/${PLATFORM_NAME}/libclang_android.dll
#bcc not yet compiled on windows
rm build-tools/${PLATFORM_NAME}/lib64/libbcc.so
lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/libbcc.dll
rm build-tools/${PLATFORM_NAME}/lib64/libbcinfo.so
lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/libbcinfo.dll
rm build-tools/${PLATFORM_NAME}/bcc_compat
bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe
rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe
rm build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld.exe
rm build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/i686-linux-android-ld.exe
rm build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld.exe
rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld.exe
rm build-tools/${PLATFORM_NAME}/lib64/libc++.so.1
rm build-tools/${PLATFORM_NAME}/lld
rm build-tools/${PLATFORM_NAME}/lld-bin/lld
# lld linker trampoline (invokes actual lld linker at lld-bin/lld.exe)
bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld.exe
# actual lld linker, and dependent library
prebuilts/sdk/tools/windows/lld-bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld-bin/lld.exe
prebuilts/sdk/tools/windows/lld-bin/libwinpthread-1.dll strip build-tools/${PLATFORM_NAME}/lld-bin/libwinpthread-1.dll
##############################################################################
# Docs Component
##############################################################################
external/sonivox/docs/JET_Authoring_Guidelines.html docs/JetCreator/JET_Authoring_Guidelines.html
external/sonivox/docs/JET_Authoring_Guidelines_files docs/JetCreator/JET_Authoring_Guidelines_files
external/sonivox/docs/JET_Creator_User_Manual.html docs/JetCreator/JET_Creator_User_Manual.html
external/sonivox/docs/JET_Creator_User_Manual_files docs/JetCreator/JET_Creator_User_Manual_files

105
build/sdk.atree
View File

@@ -29,111 +29,6 @@ development/docs/SDK_RELEASE_NOTES RELEASE_NOTES.html
frameworks/base/docs/docs-redirect.html documentation.html frameworks/base/docs/docs-redirect.html documentation.html
##############################################################################
# Platform Tools Component
##############################################################################
development/sdk/sdk_files_NOTICE.txt platform-tools/NOTICE.txt
development/sdk/plat_tools_source.properties platform-tools/source.properties
# host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
bin/adb strip platform-tools/adb
bin/fastboot strip platform-tools/fastboot
bin/mke2fs strip platform-tools/mke2fs
bin/mke2fs.conf platform-tools/mke2fs.conf
bin/e2fsdroid strip platform-tools/e2fsdroid
bin/make_f2fs strip platform-tools/make_f2fs
bin/make_f2fs_casefold strip platform-tools/make_f2fs_casefold
bin/sload_f2fs strip platform-tools/sload_f2fs
bin/sqlite3 strip platform-tools/sqlite3
bin/dmtracedump strip platform-tools/dmtracedump
bin/etc1tool strip platform-tools/etc1tool
bin/hprof-conv strip platform-tools/hprof-conv
# systrace
external/chromium-trace/catapult/ platform-tools/systrace/catapult/
external/chromium-trace/systrace.py platform-tools/systrace/systrace.py
external/chromium-trace/NOTICE platform-tools/systrace/NOTICE
external/chromium-trace/UPSTREAM_REVISION platform-tools/systrace/UPSTREAM_REVISION
##############################################################################
# Build Tools Component
##############################################################################
# Note that the build-tools sub-folder uses the platform-name as a placeholder
# at build-time. Packaging will later change that to the actual build-tools
# revision as specified in the source.properties.
development/sdk/sdk_files_NOTICE.txt build-tools/${PLATFORM_NAME}/NOTICE.txt
development/sdk/build_tools_source.properties build-tools/${PLATFORM_NAME}/source.properties
development/sdk/build_tools_runtime.properties build-tools/${PLATFORM_NAME}/runtime.properties
# build tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
bin/aapt strip build-tools/${PLATFORM_NAME}/aapt
bin/aapt2 strip build-tools/${PLATFORM_NAME}/aapt2
bin/aidl strip build-tools/${PLATFORM_NAME}/aidl
bin/split-select strip build-tools/${PLATFORM_NAME}/split-select
bin/zipalign strip build-tools/${PLATFORM_NAME}/zipalign
# renderscript (cc + headers)
bin/llvm-rs-cc strip build-tools/${PLATFORM_NAME}/llvm-rs-cc
bin/bcc_compat strip build-tools/${PLATFORM_NAME}/bcc_compat
frameworks/rs/script_api/include build-tools/${PLATFORM_NAME}/renderscript/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
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/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libm.so
prebuilts/sdk/renderscript/lib/arm/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libcompiler_rt.a
prebuilts/sdk/renderscript/lib/arm/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/libRSSupport.so
prebuilts/sdk/renderscript/lib/arm/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/librsjni.so
prebuilts/sdk/renderscript/lib/arm/librsjni_androidx.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/armeabi-v7a/librsjni_androidx.so
prebuilts/sdk/renderscript/lib/arm/libblasV8.so build-tools/${PLATFORM_NAME}/renderscript/lib/blas/armeabi-v7a/libblasV8.so
prebuilts/sdk/renderscript/lib/arm/librsrt_arm.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/armeabi-v7a/libclcore.bc
prebuilts/sdk/renderscript/lib/x86/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86/libc.so
prebuilts/sdk/renderscript/lib/x86/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86/libm.so
prebuilts/sdk/renderscript/lib/x86/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86/libcompiler_rt.a
prebuilts/sdk/renderscript/lib/x86/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/libRSSupport.so
prebuilts/sdk/renderscript/lib/x86/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/librsjni.so
prebuilts/sdk/renderscript/lib/x86/librsjni_androidx.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86/librsjni_androidx.so
prebuilts/sdk/renderscript/lib/x86/libblasV8.so build-tools/${PLATFORM_NAME}/renderscript/lib/blas/x86/libblasV8.so
prebuilts/sdk/renderscript/lib/x86/librsrt_x86.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/x86/libclcore.bc
prebuilts/sdk/renderscript/lib/arm64/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/arm64-v8a/libc.so
prebuilts/sdk/renderscript/lib/arm64/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/arm64-v8a/libm.so
prebuilts/sdk/renderscript/lib/arm64/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/arm64-v8a/libcompiler_rt.a
prebuilts/sdk/renderscript/lib/arm64/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/arm64-v8a/libRSSupport.so
prebuilts/sdk/renderscript/lib/arm64/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/arm64-v8a/librsjni.so
prebuilts/sdk/renderscript/lib/arm64/librsjni_androidx.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/arm64-v8a/librsjni_androidx.so
prebuilts/sdk/renderscript/lib/arm64/libblasV8.so build-tools/${PLATFORM_NAME}/renderscript/lib/blas/arm64-v8a/libblasV8.so
prebuilts/sdk/renderscript/lib/arm64/librsrt_arm64.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/arm64-v8a/libclcore.bc
prebuilts/sdk/renderscript/lib/x86_64/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86_64/libc.so
prebuilts/sdk/renderscript/lib/x86_64/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86_64/libm.so
prebuilts/sdk/renderscript/lib/x86_64/libcompiler_rt.a build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/x86_64/libcompiler_rt.a
prebuilts/sdk/renderscript/lib/x86_64/libRSSupport.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86_64/libRSSupport.so
prebuilts/sdk/renderscript/lib/x86_64/librsjni.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86_64/librsjni.so
prebuilts/sdk/renderscript/lib/x86_64/librsjni_androidx.so build-tools/${PLATFORM_NAME}/renderscript/lib/packaged/x86_64/librsjni_androidx.so
prebuilts/sdk/renderscript/lib/x86_64/libblasV8.so build-tools/${PLATFORM_NAME}/renderscript/lib/blas/x86_64/libblasV8.so
prebuilts/sdk/renderscript/lib/x86_64/librsrt_x86_64.bc build-tools/${PLATFORM_NAME}/renderscript/lib/bc/x86_64/libclcore.bc
# apksigner
bin/apksigner build-tools/${PLATFORM_NAME}/apksigner
framework/apksigner.jar build-tools/${PLATFORM_NAME}/lib/apksigner.jar
# dexdump
bin/dexdump build-tools/${PLATFORM_NAME}/dexdump
# d8
prebuilts/r8/r8.jar build-tools/${PLATFORM_NAME}/lib/d8.jar
prebuilts/r8/d8 build-tools/${PLATFORM_NAME}/d8
# Lambda stubs for use by javac
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar build-tools/${PLATFORM_NAME}/core-lambda-stubs.jar
############################################################################## ##############################################################################
# Platform Component # Platform Component
############################################################################## ##############################################################################

95
build/tools/patch_windows_sdk.sh
View File

@@ -1,95 +0,0 @@
#!/bin/bash
#
# Copyright (C) 2009 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.
#
# This script takes a Linux SDK, cleans it and injects the necessary Windows
# binaries needed by the SDK. The script has 2 parts:
# - development/tools/build/path_windows_sdk.sh to process the
# platform-dependent folders and files.
# - sdk/build/patch_windows_sdk.sh to process folder and files which
# depend on the sdk.git repo. This file is invoked by the makefile
# at development/build/tools/windows_sdk.mk.
#
# Input arguments:
# -q = Optional arg to make this silent. Must be given first.
# $1 = Temporary SDK directory, that is the Linux SDK being patched into
# a Windows one.
# $2 = The out/host/windows directory, which contains the new Windows
# binaries to use.
# $3 = An optional replacement for $TOPDIR (inherited from the Android
# build system), which is the top directory where Android is located.
set -e # any error stops the build
# Verbose by default. Use -q to make more silent.
V=""
Q=""
if [[ "$1" == "-q" ]]; then
Q="$1"
shift
else
echo "Win SDK: $0 $*"
set -x # show bash commands; no need for V=-v
fi
TEMP_SDK_DIR=$1
WIN_OUT_DIR=$2
TOPDIR=${TOPDIR:-$3}
# The unix2dos is provided by the APT package "tofrodos". However
# as for ubuntu lucid, the package renamed the command to "todos".
UNIX2DOS=$(which unix2dos || true)
if [[ ! -x $UNIX2DOS ]]; then
UNIX2DOS=$(which todos || true)
fi
PLATFORMS=( $TEMP_SDK_DIR/platforms/* )
if [[ ${#PLATFORMS[@]} != 1 ]]; then
echo "Error: Too many platforms found in $TEMP_SDK_DIR"
echo "Expected one. Instead, found: ${PLATFORMS[@]}"
exit 1
fi
# Package USB Driver
if [[ -n "$USB_DRIVER_HOOK" ]]; then
$USB_DRIVER_HOOK $V $TEMP_SDK_DIR $TOPDIR
fi
# Invoke atree to copy the files
# TODO: pass down OUT_HOST_EXECUTABLE to get the right bin/atree directory
${TOPDIR}out/host/linux-x86/bin/atree -f ${TOPDIR}development/build/sdk-windows-x86.atree \
-I $WIN_OUT_DIR/host/windows-x86 \
-I ${TOPDIR:-.} \
-v "PLATFORM_NAME=android-$PLATFORM_VERSION" \
-o $TEMP_SDK_DIR
# Fix EOL chars to make window users happy - fix all files at the top level
# as well as all batch files including those in platform-tools/
if [[ -x $UNIX2DOS ]]; then
find $TEMP_SDK_DIR -maxdepth 1 -name "*.[ht]*" -type f -print0 | xargs -0 $UNIX2DOS
find $TEMP_SDK_DIR -maxdepth 3 -name "*.bat" -type f -print0 | xargs -0 $UNIX2DOS
fi
# Just to make it easier on the build servers, we want fastboot and adb
# (and its DLLs) next to the new SDK.
for i in fastboot.exe adb.exe; do
cp -f $V $WIN_OUT_DIR/host/windows-x86/bin/$i $TEMP_SDK_DIR/../$i
done
for i in AdbWinApi.dll AdbWinUsbApi.dll; do
cp -f $V $WIN_OUT_DIR/host/windows-x86/lib/$i $TEMP_SDK_DIR/../$i
done

31
build/tools/sdk_repo.mk
View File

@@ -10,7 +10,7 @@ SDK_SYSIMG_DEPS :=
SDK_SYSIMG_XML_ARGS := SDK_SYSIMG_XML_ARGS :=
# Define the name of a package zip file to generate # Define the name of a package zip file to generate
# $1=OS (e.g. linux-x86, windows, etc) # $1=OS (e.g. linux, darwin)
# $2=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip) # $2=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
# $3=package to create (e.g. tools, docs, etc.) # $3=package to create (e.g. tools, docs, etc.)
# #
@@ -24,7 +24,7 @@ endef
# this generates an sdk-repo-linux-tools that contains tools/* # this generates an sdk-repo-linux-tools that contains tools/*
# #
# $1=variable where to accumulate args for mk_sdk_repo_xml. # $1=variable where to accumulate args for mk_sdk_repo_xml.
# $2=OS (e.g. linux-x86, windows, etc) # $2=OS (e.g. linux, darwin)
# $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip) # $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
# $4=package to create (e.g. tools, docs, etc.) # $4=package to create (e.g. tools, docs, etc.)
# #
@@ -47,7 +47,7 @@ endef
# this generates an sdk-repo-linux-samples that contains android-N/* # this generates an sdk-repo-linux-samples that contains android-N/*
# #
# $1=variable where to accumulate args for mk_sdk_repo_xml. # $1=variable where to accumulate args for mk_sdk_repo_xml.
# $2=OS (e.g. linux-x86, windows, etc) # $2=OS (e.g. linux, darwin)
# $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip) # $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
# $4=package to create (e.g. platforms, samples, etc.) # $4=package to create (e.g. platforms, samples, etc.)
# #
@@ -72,7 +72,7 @@ endef
# unique.) # unique.)
# #
# $1=variable where to accumulate args for mk_sdk_repo_xml. # $1=variable where to accumulate args for mk_sdk_repo_xml.
# $2=OS (e.g. linux-x86, windows, etc) # $2=OS (e.g. linux, darwin)
# $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip) # $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
# $4=package to create (e.g. system-images, support, etc.) # $4=package to create (e.g. system-images, support, etc.)
# $5=the root of directory to package in the sdk (e.g. extra/android). # $5=the root of directory to package in the sdk (e.g. extra/android).
@@ -94,7 +94,7 @@ endef
# Defines the rule to build an SDK sources package. # Defines the rule to build an SDK sources package.
# #
# $1=variable where to accumulate args for mk_sdk_repo_xml. # $1=variable where to accumulate args for mk_sdk_repo_xml.
# $2=OS (e.g. linux-x86, windows, etc) # $2=OS (e.g. linux, darwin)
# $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip) # $3=sdk zip (e.g. out/host/linux.../android-eng-sdk.zip)
# $4=package to create, must be "sources" # $4=package to create, must be "sources"
# #
@@ -125,7 +125,7 @@ endef
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Rules for main host sdk # Rules for main host sdk
ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),) ifneq ($(filter sdk,$(MAKECMDGOALS)),)
# Similarly capture all sys-img.xml that are now split out of repository.xml # Similarly capture all sys-img.xml that are now split out of repository.xml
$(eval $(call mk-sdk-repo-pkg-3,SDK_SYSIMG_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),system-images,system-images/*)) $(eval $(call mk-sdk-repo-pkg-3,SDK_SYSIMG_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),system-images,system-images/*))
@@ -134,16 +134,12 @@ SDK_SYSIMG_DEPS += \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),system-images) \ $(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),system-images) \
# All these go in the main repository.xml # All these go in the main repository.xml
$(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),build-tools))
$(eval $(call mk-sdk-repo-pkg-1,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools))
$(eval $(call mk-sdk-repo-pkg-1,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),docs)) $(eval $(call mk-sdk-repo-pkg-1,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),docs))
$(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),platforms)) $(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),platforms))
$(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),samples)) $(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),samples))
$(eval $(call mk-sdk-repo-sources,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),sources)) $(eval $(call mk-sdk-repo-sources,SDK_REPO_XML_ARGS,$(HOST_OS),$(MAIN_SDK_ZIP),sources))
SDK_REPO_DEPS += \ SDK_REPO_DEPS += \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),build-tools) \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platform-tools) \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),docs) \ $(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),docs) \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platforms) \ $(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),platforms) \
$(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),samples) \ $(call sdk-repo-pkg-zip,$(HOST_OS),$(MAIN_SDK_ZIP),samples) \
@@ -151,21 +147,6 @@ SDK_REPO_DEPS += \
endif endif
# -----------------------------------------------------------------
# Rules for win_sdk
ifneq ($(WIN_SDK_ZIP),)
# docs, platforms and samples have nothing OS-dependent right now.
$(eval $(call mk-sdk-repo-pkg-2,SDK_REPO_XML_ARGS,windows,$(WIN_SDK_ZIP),build-tools))
$(eval $(call mk-sdk-repo-pkg-1,SDK_REPO_XML_ARGS,windows,$(WIN_SDK_ZIP),platform-tools))
SDK_REPO_DEPS += \
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),build-tools) \
$(call sdk-repo-pkg-zip,windows,$(WIN_SDK_ZIP),platform-tools)
endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Pickup the most recent xml schema for repository and add-on # Pickup the most recent xml schema for repository and add-on

83
build/tools/windows_sdk.mk
View File

@@ -1,83 +0,0 @@
# Makefile to build the Windows SDK under linux.
#
# This file is included by build/core/Makefile when a PRODUCT-sdk-win_sdk build
# is requested.
#
# Summary of operations:
# - create a regular Linux SDK
# - build a few Windows tools
# - mirror the linux SDK directory and patch it with the Windows tools
#
# This way we avoid the headache of building a full SDK in MinGW mode, which is
# made complicated by the fact the build system does not support cross-compilation.
# We can only use this under Linux
ifneq ($(shell uname),Linux)
$(error Linux is required to create a Windows SDK)
endif
ifeq ($(strip $(shell which unix2dos todos 2>/dev/null)),)
$(error Need a unix2dos command. Please 'apt-get install tofrodos')
endif
# This is the list of targets that we want to generate as
# Windows executables. All the targets specified here are located in
# the topdir/development directory and are somehow platform-dependent.
WIN_TARGETS := \
aapt \
aapt2 \
adb \
aidl \
aprotoc \
bcc_compat \
clang \
etc1tool \
dexdump dmtracedump \
fastboot \
hprof-conv \
libaapt2_jni \
lld \
llvm-rs-cc \
sqlite3 \
zipalign \
split-select
# b/150355628 - we want the 64-bit libaapt2_jni for loading as JNI in 64-bit JVMs.
WIN_TARGETS += \
libaapt2_jni_64
WIN_TARGETS := $(foreach t,$(WIN_TARGETS),$(ALL_MODULES.host_cross_$(t).INSTALLED))
WIN_TARGETS += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/bin/libwinpthread-1.dll
WIN_TARGETS += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32/libwinpthread-1.dll
# MAIN_SDK_NAME/DIR is set in build/core/Makefile
WIN_SDK_NAME := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_NAME))
WIN_SDK_DIR := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_DIR))
WIN_SDK_ZIP := $(WIN_SDK_DIR)/$(WIN_SDK_NAME).zip
# b/36697262 - we want the 64-bit libaapt2_jni and its dependencies
ifdef HOST_CROSS_2ND_ARCH
$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_libaapt2_jni$(HOST_CROSS_2ND_ARCH_MODULE_SUFFIX).BUILT):lib64/libaapt2_jni.dll)
$(call dist-for-goals, win_sdk, prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/bin/libwinpthread-1.dll:lib64/libwinpthread-1.dll)
endif
.PHONY: win_sdk winsdk-tools
win_sdk: $(WIN_SDK_ZIP)
winsdk-tools: $(WIN_TARGETS)
$(WIN_SDK_ZIP): $(WIN_TARGETS) $(INTERNAL_SDK_TARGET) $(SOONG_ZIP) \
$(HOST_OUT_EXECUTABLES)/atree \
development/build/tools/patch_windows_sdk.sh \
development/build/sdk-windows-x86.atree
@echo Build Windows SDK $(WIN_SDK_NAME)
$(hide) rm -rf $(WIN_SDK_DIR) $@
$(hide) mkdir -p $(WIN_SDK_DIR)
$(hide) cp -rf $(MAIN_SDK_DIR)/$(MAIN_SDK_NAME) $(WIN_SDK_DIR)/$(WIN_SDK_NAME)
$(hide) USB_DRIVER_HOOK=$(USB_DRIVER_HOOK) \
PLATFORM_VERSION=$(PLATFORM_VERSION) \
ATREE_STRIP=$(HOST_STRIP) \
development/build/tools/patch_windows_sdk.sh -q \
$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
$(hide) $(SOONG_ZIP) -d -C $(WIN_SDK_DIR) -D $(WIN_SDK_DIR)/$(WIN_SDK_NAME) -o $@