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

Commit 5c83c195 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move manifest merger config to Soong"

parents d4b9e01f 5bcb2fc9

core/android_manifest.mk

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ $(full_android_manifest): $(MANIFEST_FIXER) 
ifneq (,$(strip $(my_full_libs_manifest_files)))



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

$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)

$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_DEPS)

$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_files)

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

	@mkdir -p $(dir $@)

core/config.mk

+0 −13
Original line number Diff line number Diff line
@@ -723,19 +723,6 @@ HIDDENAPI := $(HOST_OUT_EXECUTABLES)/hiddenapi 
FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin

FINDBUGS := $(FINDBUGS_DIR)/findbugs



# Tool to merge AndroidManifest.xmls

ANDROID_MANIFEST_MERGER_CLASSPATH := \

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

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

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

    prebuilts/gradle-plugin/com/android/tools/sdklib/26.1.0/sdklib-26.1.0.jar \

    prebuilts/gradle-plugin/org/jetbrains/kotlin/kotlin-runtime/1.0.5/kotlin-runtime-1.0.5.jar \

    prebuilts/gradle-plugin/org/jetbrains/kotlin/kotlin-stdlib/1.1.3/kotlin-stdlib-1.1.3.jar \

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

ANDROID_MANIFEST_MERGER := $(JAVA) \

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

    com.android.manifmerger.Merger



COLUMN:= column



USE_OPENJDK9 := true