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

Commit 5da4706a authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Revert "Upgrade to ManifestMerger2"" am: c165d9c9 

am: a541eaa6

Change-Id: I9395173f7db8a0a4cef8a8c2aefd8d87aac1035d
parents 26eba4fb a541eaa6

core/android_manifest.mk

+1 −3
Original line number Diff line number Diff line
@@ -34,12 +34,10 @@ ifdef my_full_libs_manifest_files 
main_android_manifest := $(full_android_manifest)

full_android_manifest := $(intermediates.COMMON)/AndroidManifest.xml

$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)

$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)

$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_deps)

	@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"

	@mkdir -p $(dir $@)

	$(hide) $(ANDROID_MANIFEST_MERGER) --main $< \

	    --libs $(call normalize-path-list,$(PRIVATE_LIBS_MANIFESTS)) \

	$(hide) $(ANDROID_MANIFEST_MERGER) --main $< --libs $(PRIVATE_LIBS_MANIFESTS) \

	    --out $@



endif

core/config.mk

+1 −8
Original line number Diff line number Diff line
@@ -675,14 +675,7 @@ FINDBUGS := $(FINDBUGS_DIR)/findbugs 
JACOCO_CLI_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jacoco-cli$(COMMON_JAVA_PACKAGE_SUFFIX)



# Tool to merge AndroidManifest.xmls

ANDROID_MANIFEST_MERGER_CLASSPATH := \

    prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/25.3.1/manifest-merger-25.3.1.jar \

    prebuilts/gradle-plugin/com/android/tools/sdk-common/25.3.1/sdk-common-25.3.1.jar \

    prebuilts/gradle-plugin/com/android/tools/common/25.3.1/common-25.3.1.jar \

    prebuilts/misc/common/guava/guava-18.0.jar

ANDROID_MANIFEST_MERGER := $(JAVA) \

    -classpath $(subst $(space),:,$(strip $(ANDROID_MANIFEST_MERGER_CLASSPATH))) \

    com.android.manifmerger.Merger

ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge



COLUMN:= column