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

Commit 5d7ec6bd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Export Make config vars to Soong to support Droiddoc"

parents 6c0ddf24 cf9d5030

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR := 
LOCAL_SOONG_PROGUARD_DICT :=

LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=

LOCAL_SOONG_RRO_DIRS :=

LOCAL_DROIDDOC_STUBS_JAR :=

LOCAL_DROIDDOC_DOC_ZIP :=

# '',true

LOCAL_SOURCE_FILES_ALL_GENERATED:=

LOCAL_SRC_FILES:=

core/soong_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ _contents := {$(newline) 


$(call add_json_str,  Make_suffix, -$(TARGET_PRODUCT))



$(call add_json_str,  BuildId,                           $(BUILD_ID))

$(call add_json_str,  BuildNumberFromFile,               $$$(BUILD_NUMBER_FROM_FILE))



$(call add_json_val,  Platform_sdk_version,              $(PLATFORM_SDK_VERSION))

$(call add_json_csv,  Platform_version_active_codenames, $(PLATFORM_VERSION_ALL_CODENAMES))

$(call add_json_csv,  Platform_version_future_codenames, $(PLATFORM_VERSION_FUTURE_CODENAMES))

core/soong_java_prebuilt.mk

+9 −0
Original line number Diff line number Diff line
@@ -23,6 +23,15 @@ common_javalib.jar := $(intermediates.COMMON)/javalib.jar 
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_jar)))

$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_pre_proguard_jar)))



ifdef LOCAL_DROIDDOC_STUBS_JAR

$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_STUBS_JAR),$(OUT_DOCS)/$(LOCAL_MODULE)-stubs.jar))

ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.jar

endif



ifdef LOCAL_DROIDDOC_DOC_ZIP

$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip))

endif



ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\

    $(intermediates.COMMON)/jacoco-report-classes.jar))