d9d5c2a95e
Soong is improving resource handling by not squashing resources from all dependencies into every android_library. This causes problems when the android_library is exported to Make, as Make is still using the old squashing behavior. Add a file to every static java library that lists the resource packages of its transitive dependencies. For modules defined in Andorid.mk files leave the file empty, but for Soong modules populate it with the list of transtiive dependencies. Pass the contents all of the files from direct dependencies to aapt2 link to include any transitive dependencies. Bug: 284023594 Test: m Dialer Change-Id: I4e8ace497d701a9645a62dd5a6ac12e9a6830dcf Merged-In: I4e8ace497d701a9645a62dd5a6ac12e9a6830dcf
231 lines
9.2 KiB
Makefile
231 lines
9.2 KiB
Makefile
#
|
|
# Copyright (C) 2008 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
# Standard rules for building a "static" java library.
|
|
# Static java libraries are not installed, nor listed on any
|
|
# classpaths. They can, however, be included wholesale in
|
|
# other java modules.
|
|
|
|
$(call record-module-type,STATIC_JAVA_LIBRARY)
|
|
LOCAL_UNINSTALLABLE_MODULE := true
|
|
LOCAL_IS_STATIC_JAVA_LIBRARY := true
|
|
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
|
|
|
|
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
|
|
|
|
my_res_package :=
|
|
|
|
# Process Support Library dependencies.
|
|
include $(BUILD_SYSTEM)/support_libraries.mk
|
|
|
|
include $(BUILD_SYSTEM)/force_aapt2.mk
|
|
|
|
# Hack to build static Java library with Android resource
|
|
# See bug 5714516
|
|
all_resources :=
|
|
need_compile_res :=
|
|
# A static Java library needs to explicily set LOCAL_RESOURCE_DIR.
|
|
ifdef LOCAL_RESOURCE_DIR
|
|
need_compile_res := true
|
|
LOCAL_RESOURCE_DIR := $(foreach d,$(LOCAL_RESOURCE_DIR),$(call clean-path,$(d)))
|
|
endif
|
|
ifneq ($(strip $(LOCAL_STATIC_ANDROID_LIBRARIES) $(LOCAL_STATIC_JAVA_AAR_LIBRARIES)),)
|
|
need_compile_res := true
|
|
endif
|
|
|
|
ifeq ($(need_compile_res),true)
|
|
all_resources := $(strip \
|
|
$(foreach dir, $(LOCAL_RESOURCE_DIR), \
|
|
$(addprefix $(dir)/, \
|
|
$(patsubst res/%,%, \
|
|
$(call find-subdir-assets,$(dir)) \
|
|
) \
|
|
) \
|
|
))
|
|
|
|
# By default we should remove the R/Manifest classes from a static Java library,
|
|
# because they will be regenerated in the app that uses it.
|
|
# But if the static Java library will be used by a library, then we may need to
|
|
# keep the generated classes with "LOCAL_JAR_EXCLUDE_FILES := none".
|
|
ifndef LOCAL_JAR_EXCLUDE_FILES
|
|
LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)
|
|
endif
|
|
ifeq (none,$(LOCAL_JAR_EXCLUDE_FILES))
|
|
LOCAL_JAR_EXCLUDE_FILES :=
|
|
endif
|
|
|
|
proguard_options_file :=
|
|
|
|
ifneq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)
|
|
proguard_options_file := $(intermediates.COMMON)/proguard_options
|
|
endif
|
|
|
|
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
|
|
LOCAL_PROGUARD_FLAGS_DEPS += $(proguard_options_file)
|
|
|
|
R_file_stamp := $(intermediates.COMMON)/src/R.stamp
|
|
LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
|
|
|
|
ifneq ($(strip $(LOCAL_STATIC_ANDROID_LIBRARIES) $(LOCAL_STATIC_JAVA_AAR_LIBRARIES)),)
|
|
# If we are using static android libraries, every source file becomes an overlay.
|
|
# This is to emulate old AAPT behavior which simulated library support.
|
|
my_res_resources :=
|
|
my_overlay_resources := $(all_resources)
|
|
else
|
|
# Otherwise, for a library we treat all the resource equal with no overlay.
|
|
my_res_resources := $(all_resources)
|
|
my_overlay_resources :=
|
|
endif
|
|
# For libraries put everything in the COMMON intermediate directory.
|
|
my_res_package := $(intermediates.COMMON)/package-res.apk
|
|
|
|
LOCAL_INTERMEDIATE_TARGETS += $(my_res_package)
|
|
|
|
endif # need_compile_res
|
|
|
|
all_res_assets := $(all_resources)
|
|
|
|
include $(BUILD_SYSTEM)/java_renderscript.mk
|
|
|
|
ifeq (true,$(need_compile_res))
|
|
# work around missing manifests by creating a default one
|
|
ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))
|
|
ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))
|
|
LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml
|
|
$(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE),$(call module-min-sdk-version))
|
|
endif
|
|
endif
|
|
include $(BUILD_SYSTEM)/android_manifest.mk
|
|
|
|
LOCAL_SDK_RES_VERSION:=$(strip $(LOCAL_SDK_RES_VERSION))
|
|
ifeq ($(LOCAL_SDK_RES_VERSION),)
|
|
LOCAL_SDK_RES_VERSION:=$(LOCAL_SDK_VERSION)
|
|
endif
|
|
|
|
framework_res_package_export :=
|
|
# Please refer to package.mk
|
|
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
|
ifneq ($(filter-out current system_current test_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_USE_PREBUILT_SDKS),$(filter current system_current test_current,$(LOCAL_SDK_RES_VERSION))),)
|
|
framework_res_package_export := \
|
|
$(call resolve-prebuilt-sdk-jar-path,$(LOCAL_SDK_RES_VERSION))
|
|
else
|
|
framework_res_package_export := \
|
|
$(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
|
|
endif
|
|
endif
|
|
|
|
# transitive-res-packages is only populated for Soong modules for now, but needs
|
|
# to exist so that other Make modules can depend on it. Create an empty file.
|
|
my_transitive_res_packages := $(intermediates.COMMON)/transitive-res-packages
|
|
$(my_transitive_res_packages):
|
|
touch $@
|
|
|
|
import_proguard_flag_files := $(strip $(foreach l,$(LOCAL_STATIC_ANDROID_LIBRARIES) $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
|
|
$(call intermediates-dir-for,JAVA_LIBRARIES,$(l),,COMMON)/export_proguard_flags))
|
|
$(intermediates.COMMON)/export_proguard_flags: $(import_proguard_flag_files) $(addprefix $(LOCAL_PATH)/,$(LOCAL_EXPORT_PROGUARD_FLAG_FILES))
|
|
@echo "Export proguard flags: $@"
|
|
rm -f $@
|
|
touch $@
|
|
for f in $+; do \
|
|
echo -e "\n# including $$f" >>$@; \
|
|
cat $$f >>$@; \
|
|
done
|
|
import_proguard_flag_files :=
|
|
|
|
include $(BUILD_SYSTEM)/aapt_flags.mk
|
|
|
|
$(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)
|
|
|
|
# add --non-constant-id to prevent inlining constants.
|
|
# AAR needs text symbol file R.txt.
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --static-lib --output-text-symbols $(intermediates.COMMON)/R.txt
|
|
ifndef LOCAL_AAPT_NAMESPACES
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_FLAGS += --no-static-lib-packages
|
|
endif
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PRODUCT_AAPT_CONFIG :=
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_AAPT_CHARACTERISTICS :=
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_PUBLICS_OUTPUT := $(intermediates.COMMON)/public_resources.xml
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_AAPT_INCLUDES := $(framework_res_package_export)
|
|
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR :=
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PROGUARD_OPTIONS_FILE := $(proguard_options_file)
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_PACKAGE_NAME :=
|
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR :=
|
|
|
|
# One more level with name res so we can zip up the flat resources that can be linked by apps.
|
|
my_compiled_res_base_dir := $(intermediates.COMMON)/flat-res/res
|
|
ifneq (,$(filter-out current,$(renderscript_target_api)))
|
|
ifneq ($(call math_gt_or_eq,$(renderscript_target_api),21),true)
|
|
my_generated_res_zips := $(rs_generated_res_zip)
|
|
endif # renderscript_target_api < 21
|
|
endif # renderscript_target_api is set
|
|
include $(BUILD_SYSTEM)/aapt2.mk
|
|
$(my_res_package) : $(framework_res_package_export)
|
|
$(my_res_package): .KATI_IMPLICIT_OUTPUTS += $(intermediates.COMMON)/R.txt
|
|
|
|
endif # need_compile_res
|
|
|
|
include $(BUILD_SYSTEM)/java_library.mk
|
|
|
|
ifeq (true,$(need_compile_res))
|
|
|
|
$(LOCAL_BUILT_MODULE): $(R_file_stamp)
|
|
$(java_source_list_file): $(R_file_stamp)
|
|
$(full_classes_compiled_jar): $(R_file_stamp)
|
|
$(full_classes_turbine_jar): $(R_file_stamp)
|
|
|
|
|
|
# if we have custom proguarding done use the proguarded classes jar instead of the normal classes jar
|
|
ifeq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)
|
|
aar_classes_jar = $(full_classes_jar)
|
|
else
|
|
aar_classes_jar = $(full_classes_pre_proguard_jar)
|
|
endif
|
|
|
|
# Rule to build AAR, archive including classes.jar, resource, etc.
|
|
built_aar := $(intermediates.COMMON)/javalib.aar
|
|
$(built_aar): PRIVATE_MODULE := $(LOCAL_MODULE)
|
|
$(built_aar): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)
|
|
$(built_aar): PRIVATE_CLASSES_JAR := $(aar_classes_jar)
|
|
$(built_aar): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
|
|
$(built_aar): PRIVATE_R_TXT := $(intermediates.COMMON)/R.txt
|
|
$(built_aar): $(JAR_ARGS)
|
|
$(built_aar) : $(aar_classes_jar) $(full_android_manifest) $(intermediates.COMMON)/R.txt
|
|
@echo "target AAR: $(PRIVATE_MODULE) ($@)"
|
|
$(hide) rm -rf $(dir $@)aar && mkdir -p $(dir $@)aar/res
|
|
$(hide) cp $(PRIVATE_ANDROID_MANIFEST) $(dir $@)aar/AndroidManifest.xml
|
|
$(hide) cp $(PRIVATE_CLASSES_JAR) $(dir $@)aar/classes.jar
|
|
# Note: Use "cp -n" to honor the resource overlay rules, if multiple res dirs exist.
|
|
$(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;)
|
|
$(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt
|
|
$(hide) $(JAR) -cMf $@ \
|
|
$(call jar-args-sorted-files-in-directory,$(dir $@)aar)
|
|
|
|
# Register the aar file.
|
|
ALL_MODULES.$(my_register_name).AAR := $(built_aar)
|
|
endif # need_compile_res
|
|
|
|
# Reset internal variables.
|
|
aar_classes_jar :=
|
|
all_res_assets :=
|
|
LOCAL_IS_STATIC_JAVA_LIBRARY :=
|