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

Commit 606540b7 authored by Evan Charlton's avatar Evan Charlton
Browse files

resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp 

Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d
parents 44d62854 f2bfa76c

core/clear_vars.mk

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