StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests"

Browse Source
This commit is contained in:
Colin Cross
2018-06-20 23:24:52 +00:00
committed by Gerrit Code Review
parent 8acf3c302b 16f1dbc43c
commit 375d9618f6
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/android_manifest.mk
View File

@@ -18,18 +18,14 @@ my_full_libs_manifest_files :=
ifndef LOCAL_DONT_MERGE_MANIFESTS ifndef LOCAL_DONT_MERGE_MANIFESTS
my_full_libs_manifest_files += $(LOCAL_FULL_LIBS_MANIFEST_FILES) 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) $(LOCAL_STATIC_ANDROID_LIBRARIES),\
my_full_libs_manifest_files += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\ $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/manifest/AndroidManifest.xml)
$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/AndroidManifest.xml)
endif
endif endif
ifdef LOCAL_STATIC_JAVA_AAR_LIBRARIES # With aapt2, we'll link in the built resource from the AAR.
# With aapt2, we'll link in the built resource from the AAR. ifneq ($(LOCAL_USE_AAPT2),true)
ifneq ($(LOCAL_USE_AAPT2),true) LOCAL_RESOURCE_DIR += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
LOCAL_RESOURCE_DIR += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\ $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/res)
$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/res)
endif
endif endif
full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml

4
core/prebuilt_internal.mk
View File

@@ -595,6 +595,10 @@ $(my_src_jar) : $(my_src_aar)
$(hide) touch $(dir $@)/proguard.txt $(hide) touch $(dir $@)/proguard.txt
$(hide) touch $(dir $@)/AndroidManifest.xml $(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 endif
$(common_classes_jar) : $(my_src_jar) $(common_classes_jar) : $(my_src_jar)

4
core/soong_java_prebuilt.mk
View File

@@ -64,6 +64,10 @@ ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
my_static_library_extra_packages := $(intermediates.COMMON)/extra_packages 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))) $(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)) $(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 endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
ifneq ($(TURBINE_ENABLED),false) ifneq ($(TURBINE_ENABLED),false)