71c5b95aa6
LOCAL_STATIC_JAVA_AAR_LIBRARIES are slightly different from LOCAL_STATIC_ANDROID_LIBRARIES, due to b/78447299 the AndroidManifest.xml from ANDROID libraries are ignored. Temporarily add support for LOCAL_STATIC_JAVA_AAR_LIBRARIES when using LOCAL_USE_AAPT2 := true, treating them the same as LOCAL_STATIC_ANDROID_LIBRARIES except that they are merged by android_manifest.xml Bug: 78447299 Bug: 79481102 Test: m FORCE_AAPT2=true checkbuild Change-Id: Ia6210810c1ea6e776be97ae1c9a586b5de844125
64 lines
2.4 KiB
Makefile
64 lines
2.4 KiB
Makefile
#
|
|
# Copyright (C) 2018 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.
|
|
#
|
|
|
|
# Including this makefile will force AAPT2 on if FORCE_AAPT2==true,
|
|
# rewriting some properties to convert standard AAPT usage to AAPT2.
|
|
|
|
ifeq ($(FORCE_AAPT2),true)
|
|
ifeq ($(LOCAL_USE_AAPT2),)
|
|
# Force AAPT2 on
|
|
LOCAL_USE_AAPT2 := true
|
|
# Filter out support library resources
|
|
LOCAL_RESOURCE_DIR := $(filter-out \
|
|
prebuilts/sdk/current/% \
|
|
frameworks/support/%,\
|
|
$(LOCAL_RESOURCE_DIR))
|
|
# Filter out unnecessary aapt flags
|
|
ifneq (,$(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))
|
|
LOCAL_AAPT_FLAGS := $(subst --extra-packages=,--extra-packages$(space), \
|
|
$(filter-out \
|
|
--extra-packages=android.support.% \
|
|
--extra-packages=androidx.%, \
|
|
$(subst --extra-packages$(space),--extra-packages=,$(LOCAL_AAPT_FLAGS))))
|
|
ifeq (,$(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))
|
|
LOCAL_AAPT_FLAGS := $(filter-out --auto-add-overlay,$(LOCAL_AAPT_FLAGS))
|
|
endif
|
|
endif
|
|
|
|
# AAPT2 is pickier about missing resources. Support library may have references to resources
|
|
# added in current, so always treat LOCAL_SDK_VERSION as LOCAL_SDK_RES_VERSION := current.
|
|
ifdef LOCAL_SDK_VERSION
|
|
LOCAL_SDK_RES_VERSION := current
|
|
endif
|
|
|
|
ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))
|
|
ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))
|
|
# work around missing manifests by creating a default one
|
|
$(call pretty-warning, Missing manifest file)
|
|
LOCAL_FULL_MANIFEST_FILE := $(call local-intermediates-dir,COMMON)/DefaultManifest.xml
|
|
$(call create-default-manifest-file,$(LOCAL_FULL_MANIFEST_FILE))
|
|
endif
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(LOCAL_USE_AAPT2),true)
|
|
ifneq ($(LOCAL_USE_AAPT2),false)
|
|
ifneq ($(LOCAL_USE_AAPT2),)
|
|
$(call pretty-error,Invalid value for LOCAL_USE_AAPT2: "$(LOCAL_USE_AAPT2)")
|
|
endif
|
|
endif
|
|
endif
|