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

Commit 121a7873 authored by Evan Charlton's avatar Evan Charlton
Browse files

Packages can specify where to find AndroidManifest.xml 

By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.

Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
parent bce4b75f

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ LOCAL_NO_EMMA_INSTRUMENT:= 
LOCAL_NO_EMMA_COMPILE:=

LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom

LOCAL_PROGUARD_FLAGS:=

LOCAL_MANIFEST_FILE:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

core/package.mk

+5 −1
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ ifneq (,$(LOCAL_JAVA_RESOURCE_FILES)) 
$(error $(LOCAL_PATH): Package modules may not set LOCAL_JAVA_RESOURCE_FILES)

endif



ifeq ($(strip $(LOCAL_MANIFEST_FILE)),)

LOCAL_MANIFEST_FILE := AndroidManifest.xml

endif



ifneq ($(strip $(LOCAL_MODULE_CLASS)),)

$(error $(LOCAL_PATH): Package modules may not set LOCAL_MODULE_CLASS)

endif
@@ -160,7 +164,7 @@ include $(BUILD_SYSTEM)/java.mk 
DONT_INSTALL_DEX_FILES := $(old_DONT_INSTALL_DEX_FILES)

old_DONT_INSTALL_DEX_FILES =



full_android_manifest := $(LOCAL_PATH)/AndroidManifest.xml

full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)

$(LOCAL_INTERMEDIATE_TARGETS): \

	PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)