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

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

Merge "Move manifest merger config to Soong" into stage-aosp-master 

am: 17c0bfa6

Change-Id: Ia5c9c6c53a8068ef556c78fe5c95359710a0160c
parents af9f8652 17c0bfa6

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
@@ -731,19 +731,6 @@ FINDBUGS := $(FINDBUGS_DIR)/findbugs 


JETIFIER := prebuilts/sdk/tools/jetifier/jetifier-standalone/bin/jetifier-standalone



# 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