p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add LOCAL_AAPT2_ONLY"

This commit is contained in:
Dan Willemsen 2017-11-18 02:17:48 +00:00 committed by Gerrit Code Review
parent 1c0112f556 bb6393c5a4
commit da5fbe3c38
5 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@ -4,6 +4,7 @@
# '',true
LOCAL_32_BIT_ONLY:=
LOCAL_AAPT2_ONLY:=
LOCAL_AAPT_FLAGS:=
LOCAL_AAPT_INCLUDE_ALL_RESOURCES:=
LOCAL_ADDITIONAL_CERTIFICATES:=

9
core/java_common.mk
View File

@ -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)

4
core/package_internal.mk
View File

@ -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.

4
core/prebuilt_internal.mk
View File

@ -547,6 +547,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))

4
core/static_java_library.mk
View File

@ -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 :=