From c8dc254b941e422294d3a08dcc5441cf84f12f1c Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 8 Dec 2017 14:52:37 -0700
Subject: [PATCH] Another attempt at diffs in offline SDK docs.

We already generate offline SDK docs as part of "docs" build, and
this change simply adds the "-diff" targets so they're also included.

Test: make -j48 docs dist
Bug: 69115817
Change-Id: Iecd3f070280b078fbdca91fdc1a6b8d65b8df863
---
 Android.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index 10d11f357eef4..9676958605dd3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -486,6 +486,10 @@ LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_API_F
 
 include $(BUILD_APIDIFF)
 
+# Hack to get diffs included in docs output
+out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip
+$(out_zip): $(full_target)
+
 # ====  System API diff ===========================
 include $(CLEAR_VARS)
 
@@ -512,6 +516,10 @@ LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_SYSTE
 
 include $(BUILD_APIDIFF)
 
+# Hack to get diffs included in docs output
+out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip
+$(out_zip): $(full_target)
+
 # ====  the api stubs and current.xml ===========================
 include $(CLEAR_VARS)
 
@@ -656,10 +664,6 @@ checkbuild: doc-comment-check-docs
 # Check comment when you are updating the API
 update-api: doc-comment-check-docs
 
-# Generate API diffs as part of docs builds
-docs: offline-sdk-referenceonly-diff
-docs: offline-system-sdk-referenceonly-diff
-
 # ====  static html in the sdk ==================================
 include $(CLEAR_VARS)