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

Commit b6013af0 authored by Colin Cross's avatar Colin Cross
Browse files

Move aapt flags from java_common.mk to aapt_flags.mk 

The aapt flags were being set in java_common.mk, which is used by
various entry points.  host_dalvik_java_library.mk and
host_java_library.mk, and java_library.mk don't support aapt, only
package_internal.mk and static_java_library.mk do.  Move the aapt
flags into aapt_flags.mk, and include it from package_internal.mk
and static_java_library.mk.

Bug: 73885582
Test: no change to build-${TARGET_PRODUCT}.ninja
Change-Id: I124393846d37b9bbc941272cce4274121ac235ef
parent 960de8ef

core/aapt_flags.mk

0 → 100644
+20 −0
Original line number Diff line number Diff line 
## AAPT Flags

# aapt doesn't accept multiple --extra-packages flags.

# We have to collapse them into a single --extra-packages flag here.

LOCAL_AAPT_FLAGS := $(strip $(LOCAL_AAPT_FLAGS))

ifdef LOCAL_AAPT_FLAGS

  ifeq ($(filter 0 1,$(words $(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))),)

    aapt_flags := $(subst --extra-packages$(space),--extra-packages@,$(LOCAL_AAPT_FLAGS))

    aapt_flags_extra_packages := $(patsubst --extra-packages@%,%,$(filter --extra-packages@%,$(aapt_flags)))

    aapt_flags_extra_packages := $(sort $(subst :,$(space),$(aapt_flags_extra_packages)))

    LOCAL_AAPT_FLAGS := $(filter-out --extra-packages@%,$(aapt_flags)) \

        --extra-packages $(subst $(space),:,$(aapt_flags_extra_packages))

    aapt_flags_extra_packages :=

    aapt_flags :=

  endif

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(TARGET_AAPT_CHARACTERISTICS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)

core/java_common.mk

+0 −21
Original line number Diff line number Diff line
@@ -412,27 +412,6 @@ endif 


##########################################################

ifndef LOCAL_IS_HOST_MODULE

## AAPT Flags

# aapt doesn't accept multiple --extra-packages flags.

# We have to collapse them into a single --extra-packages flag here.

LOCAL_AAPT_FLAGS := $(strip $(LOCAL_AAPT_FLAGS))

ifdef LOCAL_AAPT_FLAGS

ifeq ($(filter 0 1,$(words $(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))),)

aapt_flags := $(subst --extra-packages$(space),--extra-packages@,$(LOCAL_AAPT_FLAGS))

aapt_flags_extra_packages := $(patsubst --extra-packages@%,%,$(filter --extra-packages@%,$(aapt_flags)))

aapt_flags_extra_packages := $(sort $(subst :,$(space),$(aapt_flags_extra_packages)))

LOCAL_AAPT_FLAGS := $(filter-out --extra-packages@%,$(aapt_flags)) \

    --extra-packages $(subst $(space),:,$(aapt_flags_extra_packages))

aapt_flags_extra_packages :=

aapt_flags :=

endif

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_AAPT_CHARACTERISTICS := $(TARGET_AAPT_CHARACTERISTICS)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_PACKAGE_NAME := $(LOCAL_MANIFEST_PACKAGE_NAME)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOCAL_MANIFEST_INSTRUMENTATION_FOR)



ifdef aidl_sources

ALL_MODULES.$(my_register_name).AIDL_FILES := $(aidl_sources)

endif

core/package_internal.mk

+2 −0
Original line number Diff line number Diff line
@@ -367,6 +367,8 @@ endif # LOCAL_DATA_BINDING 


resource_export_package :=



include $(BUILD_SYSTEM)/aapt_flags.mk



ifeq ($(need_compile_res),true)



###############################

core/static_java_library.mk

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ $(intermediates.COMMON)/export_proguard_flags: $(import_proguard_flag_files) $(a 
import_proguard_flag_files :=

endif



include $(BUILD_SYSTEM)/aapt_flags.mk



# add --non-constant-id to prevent inlining constants.

# AAR needs text symbol file R.txt.

ifdef LOCAL_USE_AAPT2