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

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

Merge "Add LOCAL_DONT_MERGE_MANIFESTS" am: 5d80834b am: 663d8eea 

am: 9cddc255

Change-Id: I34038c531d2ba7e601de62ea4c3c0e261077cee4
parents 5b9899af 9cddc255

core/android_manifest.mk

+18 −11
Original line number Diff line number Diff line
@@ -11,19 +11,26 @@ else 
  full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)

endif



my_full_libs_manifest_files := $(LOCAL_FULL_LIBS_MANIFEST_FILES)



LOCAL_STATIC_JAVA_AAR_LIBRARIES := $(strip $(LOCAL_STATIC_JAVA_AAR_LIBRARIES))



my_full_libs_manifest_files :=



ifndef LOCAL_DONT_MERGE_MANIFESTS

  my_full_libs_manifest_files += $(LOCAL_FULL_LIBS_MANIFEST_FILES)



  ifdef LOCAL_STATIC_JAVA_AAR_LIBRARIES

    my_full_libs_manifest_files += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\

      $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/AndroidManifest.xml)

  endif

endif



ifdef LOCAL_STATIC_JAVA_AAR_LIBRARIES

  # With aapt2, we'll link in the built resource from the AAR.

  ifneq ($(LOCAL_USE_AAPT2),true)

    LOCAL_RESOURCE_DIR += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\

      $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/res)

endif  # LOCAL_USE_AAPT2

endif  # LOCAL_STATIC_JAVA_AAR_LIBRARIES

  endif

endif



# Set up rules to merge library manifest files

ifneq (,$(strip $(my_full_libs_manifest_files)))

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ LOCAL_DISABLE_RESOLVE_SUPPORT_LIBRARIES:= 
LOCAL_DONT_CHECK_MODULE:=

# Don't delete the META_INF dir when merging static Java libraries.

LOCAL_DONT_DELETE_JAR_META_INF:=

LOCAL_DONT_MERGE_MANIFESTS:=

LOCAL_DPI_FILE_STEM:=

LOCAL_DPI_VARIANTS:=

LOCAL_DROIDDOC_ASSET_DIR:=