From 28ca42bd082ec23fea062b22643fd9838e0bb094 Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Wed, 30 Nov 2016 01:42:29 +0000
Subject: [PATCH] Merge "Fix multi source folder API checking" into mnc-ub-dev
 am: 4daf2f0ac0 am: 89d70ae8d8

* commit '89d70ae8d8e1238d0bb575be8391752f3c98fb77':
  Fix multi source folder API checking

GitOrigin-RevId=6b2dec972c8e40773bdfa4dee4b038d94852962e

PiperOrigin-RevId: 140551147
---
 Android.mk | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index c966a2230..6f4ac3bcc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,6 +32,8 @@ LOCAL_AAPT_FLAGS := \
 LOCAL_JAR_EXCLUDE_FILES := none
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+support_module_src_files := $(LOCAL_SRC_FILES)
+
 # A helper sub-library to resolve cyclic dependencies between src and the platform dependent
 # implementations
 include $(CLEAR_VARS)
@@ -44,6 +46,8 @@ LOCAL_JAVA_LIBRARIES := android-support-design-res \
     android-support-v7-recyclerview
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+support_module_src_files += $(LOCAL_SRC_FILES)
+
 # A helper sub-library that makes direct use of Eclair MR1 APIs
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-design-eclair-mr1
@@ -56,6 +60,8 @@ LOCAL_JAVA_LIBRARIES := android-support-design-res \
     android-support-v7-recyclerview
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+support_module_src_files += $(LOCAL_SRC_FILES)
+
 # A helper sub-library that makes direct use of Honeycomb APIs
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-design-honeycomb
@@ -68,6 +74,8 @@ LOCAL_JAVA_LIBRARIES := android-support-design-res \
     android-support-v7-recyclerview
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+support_module_src_files += $(LOCAL_SRC_FILES)
+
 # A helper sub-library that makes direct use of Honeycomb MR1 APIs
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-design-honeycomb-mr1
@@ -80,6 +88,8 @@ LOCAL_JAVA_LIBRARIES := android-support-design-res \
     android-support-v7-recyclerview
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+support_module_src_files += $(LOCAL_SRC_FILES)
+
 # A helper sub-library that makes direct use of ICS APIs
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-design-ics
@@ -92,6 +102,8 @@ LOCAL_JAVA_LIBRARIES := android-support-design-res \
     android-support-v7-recyclerview
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+support_module_src_files += $(LOCAL_SRC_FILES)
+
 # A helper sub-library that makes direct use of Lollipop APIs
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-design-lollipop
@@ -104,6 +116,8 @@ LOCAL_JAVA_LIBRARIES := android-support-design-res \
     android-support-v7-recyclerview
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+support_module_src_files += $(LOCAL_SRC_FILES)
+
 # Here is the final static library that apps can link against.
 # The R class is automatically excluded from the generated library.
 # Applications that use this library must specify LOCAL_RESOURCE_DIR
@@ -119,11 +133,12 @@ LOCAL_JAVA_LIBRARIES := android-support-design-res \
     android-support-v7-recyclerview
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+support_module_src_files += $(LOCAL_SRC_FILES)
+
 # API Check
 # ---------------------------------------------
 support_module := $(LOCAL_MODULE)
 support_module_api_dir := $(LOCAL_PATH)/api
-support_module_src_files := $(LOCAL_SRC_FILES)
 support_module_java_libraries := $(LOCAL_JAVA_LIBRARIES)
 support_module_java_packages := android.support.design.*
 include $(SUPPORT_API_CHECK)