p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8 

am: 7edfe29e8f

Change-Id: I1ef8af667a806ead8c4098bbdab12d377e8fd7b1
This commit is contained in:
Nan Zhang 2018-02-22 23:11:08 +00:00 committed by android-build-merger
parent a5baf56e6c 7edfe29e8f
commit b335c4a4f3
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/clear_vars.mk
View File

@ -240,6 +240,8 @@ LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
LOCAL_SOONG_PROGUARD_DICT := LOCAL_SOONG_PROGUARD_DICT :=
LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE := LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
LOCAL_SOONG_RRO_DIRS := LOCAL_SOONG_RRO_DIRS :=
LOCAL_DROIDDOC_STUBS_JAR :=
LOCAL_DROIDDOC_DOC_ZIP :=
# '',true # '',true
LOCAL_SOURCE_FILES_ALL_GENERATED:= LOCAL_SOURCE_FILES_ALL_GENERATED:=
LOCAL_SRC_FILES:= LOCAL_SRC_FILES:=

3
core/soong_config.mk
View File

@ -42,6 +42,9 @@ _contents := {$(newline)
$(call add_json_str, Make_suffix, -$(TARGET_PRODUCT)) $(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_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_active_codenames, $(PLATFORM_VERSION_ALL_CODENAMES))
$(call add_json_csv, Platform_version_future_codenames, $(PLATFORM_VERSION_FUTURE_CODENAMES)) $(call add_json_csv, Platform_version_future_codenames, $(PLATFORM_VERSION_FUTURE_CODENAMES))

9
core/soong_java_prebuilt.mk
View File

@ -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_jar)))
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(full_classes_pre_proguard_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 ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\ $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
$(intermediates.COMMON)/jacoco-report-classes.jar)) $(intermediates.COMMON)/jacoco-report-classes.jar))