diff options
| -rw-r--r-- | core/soong_droiddoc_prebuilt.mk | 25 | ||||
| -rw-r--r-- | core/soong_java_prebuilt.mk | 14 | ||||
| -rw-r--r-- | target/product/mainline_arm64.mk | 1 |
3 files changed, 25 insertions, 15 deletions
diff --git a/core/soong_droiddoc_prebuilt.mk b/core/soong_droiddoc_prebuilt.mk new file mode 100644 index 0000000000..510609b9af --- /dev/null +++ b/core/soong_droiddoc_prebuilt.mk @@ -0,0 +1,25 @@ +# Droiddoc prebuilt coming from Soong. + +ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) + $(call pretty-error,soong_droiddoc_prebuilt.mk may only be used from Soong) +endif + +ifdef LOCAL_DROIDDOC_STUBS_SRCJAR +$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_STUBS_SRCJAR),$(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar)) +ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar + +.PHONY: $(LOCAL_MODULE) +$(LOCAL_MODULE) : $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar +endif + +ifdef LOCAL_DROIDDOC_DOC_ZIP +$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)) +$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip) + +.PHONY: $(LOCAL_MODULE)-docs.zip +$(LOCAL_MODULE)-docs.zip : $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip +endif + +ifdef LOCAL_DROIDDOC_ANNOTATIONS_ZIP +$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_ANNOTATIONS_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.zip)) +endif diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 44b4f5c334..210ee5f149 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -24,20 +24,6 @@ greylist_txt := $(intermediates.COMMON)/greylist.txt $(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_SRCJAR -$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_STUBS_SRCJAR),$(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar)) -ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar -endif - -ifdef LOCAL_DROIDDOC_DOC_ZIP -$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)) -$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip) -endif - -ifdef LOCAL_DROIDDOC_ANNOTATIONS_ZIP -$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_ANNOTATIONS_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_annotations.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)) diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk index 281f8240d7..92954db710 100644 --- a/target/product/mainline_arm64.mk +++ b/target/product/mainline_arm64.mk @@ -28,4 +28,3 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := \ root/init.zygote64_32.rc \ system/etc/seccomp_policy/crash_dump.arm.policy \ system/etc/seccomp_policy/mediacodec.policy \ - system/lib64/libminadbd_services.so \ |