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

Commit 515fe121 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Remove apidiff task and droiddoc jdiff support" am: 20f517e1 am: 0e2c3010 am: e8fcf535 

Original change: https://android-review.googlesource.com/c/platform/build/+/1455018

Change-Id: I20f12ce7189bef4ff21e0b9ca5234f3e75763a3c
parents 75426ef3 e8fcf535

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ LOCAL_DROIDDOC_ASSET_DIR:= 
LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=

LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=

LOCAL_DROIDDOC_DOC_ZIP :=

LOCAL_DROIDDOC_JDIFF_DOC_ZIP :=

LOCAL_DROIDDOC_HTML_DIR:=

LOCAL_DROIDDOC_METADATA_ZIP:=

LOCAL_DROIDDOC_OPTIONS:=

core/soong_droiddoc_prebuilt.mk

+0 −10
Original line number Diff line number Diff line
@@ -29,16 +29,6 @@ ifdef LOCAL_DROIDDOC_API_VERSIONS_XML 
$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_API_VERSIONS_XML),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)_generated-api-versions.xml))

endif



ifdef LOCAL_DROIDDOC_JDIFF_DOC_ZIP

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

$(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip)



ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip



.PHONY: $(LOCAL_MODULE) $(LOCAL_MODULE)-jdiff

$(LOCAL_MODULE) $(LOCAL_MODULE)-jdiff : $(OUT_DOCS)/$(LOCAL_MODULE)-jdiff-docs.zip

endif



ifdef LOCAL_DROIDDOC_METADATA_ZIP

$(eval $(call copy-one-file,$(LOCAL_DROIDDOC_METADATA_ZIP),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(LOCAL_MODULE)-metadata.zip))

endif

core/tasks/apidiff.mk

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
# Copyright (C) 2017 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



#

# Rules for building API diffs.

#



.PHONY: api-diff



api-diff: api-stubs-docs-jdiff