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

Commit bb6393c5 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Add LOCAL_AAPT2_ONLY 

This allows modules to specify that they may only be used from modules
using aapt2. Using aapt2 removes absolute path references to modules, so
this can be useful if a module is preparing to move its sources, or
replace itself with a prebuilt aar.

Test: m
Test: Label frameworks/support/design; m
Test: Label frameworks/support/v4; m
Test: build/soong/build_test.bash
Change-Id: Icfb3d4b19a6a0e3a3bb00091d2a97a4d88c0c761
parent f1f66974

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

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

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