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

Commit 375d9618 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests"

parents 8acf3c30 16f1dbc4

core/android_manifest.mk

+6 −10
Original line number Diff line number Diff line
@@ -18,19 +18,15 @@ 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

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

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

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

endif



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

core/prebuilt_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -595,6 +595,10 @@ $(my_src_jar) : $(my_src_aar) 
	$(hide) touch $(dir $@)/proguard.txt

	$(hide) touch $(dir $@)/AndroidManifest.xml



my_prebuilt_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml

$(eval $(call copy-one-file,$(my_src_android_manifest),$(my_prebuilt_android_manifest)))

$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_prebuilt_android_manifest))



endif



$(common_classes_jar) : $(my_src_jar)

core/soong_java_prebuilt.mk

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE 
  my_static_library_extra_packages := $(intermediates.COMMON)/extra_packages

  $(eval $(call copy-one-file,$(LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES),$(my_static_library_extra_packages)))

  $(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_static_library_extra_packages))



  my_static_library_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml

  $(eval $(call copy-one-file,$(LOCAL_FULL_MANIFEST_FILE),$(my_static_library_android_manifest)))

  $(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_static_library_android_manifest))

endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE



ifneq ($(TURBINE_ENABLED),false)