Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d2b2f0d authored Nov 18, 2017 by Dan Willemsen Committed by android-build-merger Nov 18, 2017

Merge "Add LOCAL_AAPT2_ONLY" am: da5fbe3c am: 9b0a730b

am: 9f7c83dd

Change-Id: Ia1ad45679602e1b05634e4befef35c29ac04498a

parents fe2cf3dd 9f7c83dd

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@

		# '',true
		LOCAL_32_BIT_ONLY:=
		LOCAL_AAPT2_ONLY:=
		LOCAL_AAPT_FLAGS:=
		LOCAL_AAPT_INCLUDE_ALL_RESOURCES:=
		LOCAL_AAPT_NAMESPACES:=

core/java_common.mk

+8 −1

Original line number	Diff line number	Diff line
		@@ -414,7 +414,14 @@ my_warn_types :=
		my_allowed_types := java:sdk java:system java:platform
		endif

		my_link_deps := $(addprefix JAVA_LIBRARIES:,$(LOCAL_STATIC_JAVA_LIBRARIES))
		ifdef LOCAL_AAPT2_ONLY
		my_link_type += aapt2_only
		endif
		ifdef LOCAL_USE_AAPT2
		my_allowed_types += aapt2_only
		endif

		my_link_deps := $(addprefix JAVA_LIBRARIES:,$(LOCAL_STATIC_JAVA_LIBRARIES) $(LOCAL_JAVA_LIBRARIES))
		my_link_deps += $(addprefix APPS:,$(apk_libraries))

		my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)

core/package_internal.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,10 @@ ifneq ($(all_assets),)
		need_compile_asset := true
		endif

		ifdef LOCAL_AAPT2_ONLY
		LOCAL_USE_AAPT2 := true
		endif

		my_res_package :=
		ifdef LOCAL_USE_AAPT2
		# In aapt2 the last takes precedence.

core/prebuilt_internal.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -587,6 +587,10 @@ $(common_classes_pre_proguard_jar) : $(my_src_jar)
		$(common_javalib_jar) : $(common_classes_jar)
		$(transform-prebuilt-to-target)

		ifdef LOCAL_AAPT2_ONLY
		LOCAL_USE_AAPT2 := true
		endif

		ifdef LOCAL_USE_AAPT2
		ifneq ($(my_src_aar),)
		LOCAL_SDK_RES_VERSION:=$(strip $(LOCAL_SDK_RES_VERSION))

core/static_java_library.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,10 @@ intermediates.COMMON := $(call local-intermediates-dir,COMMON)

		my_res_package :=

		ifdef LOCAL_AAPT2_ONLY
		LOCAL_USE_AAPT2 := true
		endif

		# Hack to build static Java library with Android resource
		# See bug 5714516
		all_resources :=