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

Commit 9b6865f8 authored by Evan Charlton's avatar Evan Charlton Committed by Android Git Automerger
Browse files

am 606540b7: resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp 

Merge commit '606540b7'

* commit '606540b7':
  Packages can specify where to find AndroidManifest.xml
parents 1812dfda 606540b7

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ LOCAL_PROGUARD_ENABLED:= # '',optonly,full,custom 
LOCAL_PROGUARD_FLAGS:=

LOCAL_EMMA_COVERAGE_FILTER:=

LOCAL_WARNINGS_ENABLE:=

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)