diff options
| author | Chris Banes <chrisbanes@google.com> | 2015-10-20 08:55:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-20 08:55:14 +0000 |
| commit | 4daf2f0ac0fbc992c384a39cef2b05f159420710 (patch) | |
| tree | 86849b4a068ae55d1feeead81a9960227f747937 /design | |
| parent | df852a68b1d63c1365ec25a98324144454366d9e (diff) | |
| parent | 95ad49b720f4990d39d05f7e46a5c7bc83afc9d6 (diff) | |
| download | android_frameworks_support-4daf2f0ac0fbc992c384a39cef2b05f159420710.tar.gz android_frameworks_support-4daf2f0ac0fbc992c384a39cef2b05f159420710.tar.bz2 android_frameworks_support-4daf2f0ac0fbc992c384a39cef2b05f159420710.zip | |
Merge "Fix multi source folder API checking" into mnc-ub-dev
Diffstat (limited to 'design')
| -rw-r--r-- | design/Android.mk | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/design/Android.mk b/design/Android.mk index c966a22302..6f4ac3bcc0 100644 --- a/design/Android.mk +++ b/design/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) |