Merge "Refactor prebuilt tools" am: bc45a33c93 am: 68016fc55f (4ef344a5) · Commits · e / os / android_build

core/config.mk

+47 −53

Original line number	Original line	Diff line number	Diff line
	@@ -494,24 +494,23 @@ ALLOW_MISSING_DEPENDENCIES := true
	endif		endif
	.KATI_READONLY := ALLOW_MISSING_DEPENDENCIES		.KATI_READONLY := ALLOW_MISSING_DEPENDENCIES

	#
	# Tools that are prebuilts for TARGET_BUILD_APPS
	#
	prebuilt_sdk_tools := prebuilts/sdk/tools		prebuilt_sdk_tools := prebuilts/sdk/tools
	prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin		prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin

			USE_PREBUILT_SDK_TOOLS_IN_PLACE := true

			#
			# Tools that are prebuilts for TARGET_BUILD_APPS
			#
			ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
	AIDL := $(HOST_OUT_EXECUTABLES)/aidl		AIDL := $(HOST_OUT_EXECUTABLES)/aidl
	AAPT := $(HOST_OUT_EXECUTABLES)/aapt		AAPT := $(HOST_OUT_EXECUTABLES)/aapt
	AAPT2 := $(HOST_OUT_EXECUTABLES)/aapt2		AAPT2 := $(HOST_OUT_EXECUTABLES)/aapt2
	ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign		MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses
	SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)		SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)
	SIGNAPK_JNI_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)		SIGNAPK_JNI_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)
	LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc		ZIPALIGN := $(HOST_OUT_EXECUTABLES)/zipalign
	BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat
	DEPMOD := $(HOST_OUT_EXECUTABLES)/depmod

	#TODO: use a smaller -Xmx value for most libraries;
	# only core.jar and framework.jar need a heap this big.
	ifndef DX_ALT_JAR		ifndef DX_ALT_JAR
	DX := $(HOST_OUT_EXECUTABLES)/dx		DX := $(HOST_OUT_EXECUTABLES)/dx
	DX_COMMAND := $(DX) -JXms16M -JXmx2048M		DX_COMMAND := $(DX) -JXms16M -JXmx2048M
	@@ -519,14 +518,29 @@ else
	DX := $(DX_ALT_JAR)		DX := $(DX_ALT_JAR)
	DX_COMMAND := $(JAVA) -Xms16M -Xmx2048M -jar $(DX)		DX_COMMAND := $(JAVA) -Xms16M -Xmx2048M -jar $(DX)
	endif		endif
			else # TARGET_BUILD_APPS \|\| TARGET_BUILD_PDK
			AIDL := $(prebuilt_sdk_tools_bin)/aidl
			AAPT := $(prebuilt_sdk_tools_bin)/aapt
			AAPT2 := $(prebuilt_sdk_tools_bin)/aapt2
			DX := $(prebuilt_sdk_tools)/dx
			DX_COMMAND := $(DX) -JXms16M -JXmx2048M
			MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses
			ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign
			SIGNAPK_JAR := $(prebuilt_sdk_tools)/lib/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)
			SIGNAPK_JNI_LIBRARY_PATH := $(prebuilt_sdk_tools)/$(HOST_OS)/lib64
			endif # TARGET_BUILD_APPS \|\| TARGET_BUILD_PDK

	MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses		ifeq (,$(TARGET_BUILD_APPS))
			# Use RenderScript prebuilts for unbundled builds but not PDK builds
	SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip		LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc
	ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip		BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat
	FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist		else
			LLVM_RS_CC := $(prebuilt_sdk_tools_bin)/llvm-rs-cc
			BCC_COMPAT := $(prebuilt_sdk_tools_bin)/bcc_compat
			endif # TARGET_BUILD_PDK

	SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper		prebuilt_sdk_tools :=
			prebuilt_sdk_tools_bin :=

	# Always use prebuilts for ckati and makeparallel		# Always use prebuilts for ckati and makeparallel
	prebuilt_build_tools := prebuilts/build-tools		prebuilt_build_tools := prebuilts/build-tools
	@@ -535,38 +549,18 @@ prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin
	else		else
	prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/asan/bin		prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/asan/bin
	endif		endif

	ACP := $(prebuilt_build_tools_bin)/acp		ACP := $(prebuilt_build_tools_bin)/acp
	CKATI := $(prebuilt_build_tools_bin)/ckati		CKATI := $(prebuilt_build_tools_bin)/ckati
			DEPMOD := $(HOST_OUT_EXECUTABLES)/depmod
			FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist
	IJAR := $(prebuilt_build_tools_bin)/ijar		IJAR := $(prebuilt_build_tools_bin)/ijar
	MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel		MAKEPARALLEL := $(prebuilt_build_tools_bin)/makeparallel
			SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper
			SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip
			ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip
	ZIPTIME := $(prebuilt_build_tools_bin)/ziptime		ZIPTIME := $(prebuilt_build_tools_bin)/ziptime

	USE_PREBUILT_SDK_TOOLS_IN_PLACE := true

	# Override the definitions above for unbundled and PDK builds
	ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
	AIDL := $(prebuilt_sdk_tools_bin)/aidl
	AAPT := $(prebuilt_sdk_tools_bin)/aapt
	AAPT2 := $(prebuilt_sdk_tools_bin)/aapt2
	ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign
	SIGNAPK_JAR := $(prebuilt_sdk_tools)/lib/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)
	# Use 64-bit libraries unconditionally because 32-bit JVMs are no longer supported
	SIGNAPK_JNI_LIBRARY_PATH := $(prebuilt_sdk_tools)/$(HOST_OS)/lib64

	DX := $(prebuilt_sdk_tools)/dx
	DX_COMMAND := $(DX) -JXms16M -JXmx2048M
	MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses

	# Don't use prebuilts in PDK
	ifneq ($(TARGET_BUILD_PDK),true)
	LLVM_RS_CC := $(prebuilt_sdk_tools_bin)/llvm-rs-cc
	BCC_COMPAT := $(prebuilt_sdk_tools_bin)/bcc_compat
	endif # TARGET_BUILD_PDK
	endif # TARGET_BUILD_APPS \|\| TARGET_BUILD_PDK
	prebuilt_sdk_tools :=
	prebuilt_sdk_tools_bin :=


	# ---------------------------------------------------------------		# ---------------------------------------------------------------
	# Generic tools.		# Generic tools.
	JACK := $(HOST_OUT_EXECUTABLES)/jack		JACK := $(HOST_OUT_EXECUTABLES)/jack