diff options
Diffstat (limited to 'core/android_manifest.mk')
| -rw-r--r-- | core/android_manifest.mk | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/core/android_manifest.mk b/core/android_manifest.mk index c641b75..21b95c2 100644 --- a/core/android_manifest.mk +++ b/core/android_manifest.mk @@ -11,27 +11,13 @@ else full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE) endif -my_full_libs_manifest_files := $(LOCAL_FULL_LIBS_MANIFEST_FILES) -my_full_libs_manifest_deps := $(LOCAL_FULL_LIBS_MANIFEST_FILES) - -# Set up dependency on aar libraries -ifdef LOCAL_STATIC_JAVA_AAR_LIBRARIES -my_full_libs_manifest_deps += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\ - $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/classes.jar) -my_full_libs_manifest_files += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\ - $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/AndroidManifest.xml) - -LOCAL_RESOURCE_DIR += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\ - $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/res) -endif - # Set up rules to merge library manifest files -ifdef my_full_libs_manifest_files +ifdef LOCAL_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) : $(main_android_manifest) $(my_full_libs_manifest_deps) - @echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)" +$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(LOCAL_FULL_LIBS_MANIFEST_FILES) +$(full_android_manifest) : $(main_android_manifest) $(LOCAL_FULL_LIBS_MANIFEST_FILES) + @echo "Merge android manifest files: $@ <-- $^" @mkdir -p $(dir $@) $(hide) $(ANDROID_MANIFEST_MERGER) --main $< --libs $(PRIVATE_LIBS_MANIFESTS) \ --out $@ |