StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2 am: 362bf03c3b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ie3d1f00336f86542103bda4b33d9b9d03e9e3927
This commit is contained in:
Spandan Das
2022-01-06 23:00:13 +00:00
committed by Automerger Merge Worker
parent 49aceda26d 362bf03c3b
commit 0d3e1277c6
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/force_aapt2.mk
View File

@@ -44,10 +44,3 @@ ifneq (,$(filter-out current system_current test_current core_current,$(LOCAL_SD
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
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

8
core/package_internal.mk
View File

@@ -97,6 +97,14 @@ LOCAL_MANIFEST_PACKAGE_NAME := $(override_manifest_name)
endif
include $(BUILD_SYSTEM)/force_aapt2.mk
# validate that app contains a manifest file for aapt2
ifeq (,$(strip $(LOCAL_MANIFEST_FILE)$(LOCAL_FULL_MANIFEST_FILE)))
ifeq (,$(wildcard $(LOCAL_PATH)/AndroidManifest.xml))
$(call pretty-error,App missing manifest file which is required by aapt2. \
Provide a manifest file by either setting LOCAL_MANIFEST_FILE in Android.mk \
or via a AndroidManifest.xml in this directory)
endif
endif
# Process Support Library dependencies.
include $(BUILD_SYSTEM)/support_libraries.mk

7
core/static_java_library.mk
View File

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