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

Commit 362bf03c authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4 

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

Change-Id: Ic71cff4d144e66e4528da4afe9b799eabb4aa723
parents 7e2a59a1 13daf3d4

core/force_aapt2.mk

+0 −7
Original line number Diff line number Diff line
@@ -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

core/package_internal.mk

+8 −0
Original line number Diff line number Diff line
@@ -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

core/static_java_library.mk

+7 −0
Original line number Diff line number Diff line
@@ -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))