Move all support library projects to use a single compilation unit
Also cleans up build files to include annotations as an explicit import,
set compileSdkVersion consistently to currentSdk, and remove unnecessary
lines. Removes obsolete API directories in VDC / AVDC.
Because NotificationCompatBase was using @removed APIs, updated that class
to use reflection. Also fixes method visibility in VDC / AVDC.
Bug: 29630077
Test: make and gradle builds successful
Change-Id: Ia9208246837347ce3d8df4adbe6b0ce406d3844a
diff --git a/design/Android.mk b/design/Android.mk
index 3217915..b3bc846 100644
--- a/design/Android.mk
+++ b/design/Android.mk
@@ -14,158 +14,38 @@
LOCAL_PATH := $(call my-dir)
-# Android libraries referenced by this module's resources.
-resource_libs := \
- android-support-v7-appcompat \
- android-support-v7-recyclerview
-
-# Build the resources using the latest applicable SDK version.
-# We do this here because the final static library must be compiled with an older
-# SDK version than the resources. The resources library and the R class that it
-# contains will not be linked into the final static library.
-include $(CLEAR_VARS)
-LOCAL_USE_AAPT2 := true
-LOCAL_MODULE := android-support-design-res
-LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
-LOCAL_SRC_FILES := $(call all-java-files-under, dummy)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SHARED_ANDROID_LIBRARIES := $(resource_libs)
-LOCAL_AAPT_FLAGS := --no-version-vectors
-LOCAL_JAR_EXCLUDE_FILES := none
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# A helper sub-library to resolve cyclic dependencies between src and the platform dependent
-# implementations
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-design-base
-LOCAL_SDK_VERSION := 9
-LOCAL_SRC_FILES := $(call all-java-files-under, base)
-LOCAL_JAVA_LIBRARIES := \
- android-support-design-res \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment \
- android-support-v7-appcompat \
- android-support-v7-recyclerview
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# A helper sub-library that makes direct use of Gingerbread APIs
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-design-gingerbread
-LOCAL_SDK_VERSION := 9
-LOCAL_SRC_FILES := $(call all-java-files-under, gingerbread)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-base
-LOCAL_JAVA_LIBRARIES := \
- android-support-design-res \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment \
- android-support-v7-appcompat \
- android-support-v7-recyclerview
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# A helper sub-library that makes direct use of Honeycomb APIs
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-design-honeycomb
-LOCAL_SDK_VERSION := 11
-LOCAL_SRC_FILES := $(call all-java-files-under, honeycomb)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-gingerbread
-LOCAL_JAVA_LIBRARIES := \
- android-support-design-res \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment \
- android-support-v7-appcompat \
- android-support-v7-recyclerview
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# A helper sub-library that makes direct use of Honeycomb MR1 APIs
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-design-honeycomb-mr1
-LOCAL_SDK_VERSION := 12
-LOCAL_SRC_FILES := $(call all-java-files-under, honeycomb-mr1)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-honeycomb
-LOCAL_JAVA_LIBRARIES := \
- android-support-design-res \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment \
- android-support-v7-appcompat \
- android-support-v7-recyclerview
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# A helper sub-library that makes direct use of ICS APIs
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-design-ics
-LOCAL_SDK_VERSION := 14
-LOCAL_SRC_FILES := $(call all-java-files-under, ics)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-honeycomb-mr1
-LOCAL_JAVA_LIBRARIES := \
- android-support-design-res \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment \
- android-support-v7-appcompat \
- android-support-v7-recyclerview \
- android-support-transition
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# A helper sub-library that makes direct use of Lollipop APIs
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-design-lollipop
-LOCAL_SDK_VERSION := 21
-LOCAL_SRC_FILES := $(call all-java-files-under, lollipop)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-ics
-LOCAL_JAVA_LIBRARIES := \
- android-support-design-res \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment \
- android-support-v7-appcompat \
- android-support-v7-recyclerview \
- android-support-transition
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
# Here is the final static library that apps can link against.
# Applications that use this library must specify
#
# LOCAL_STATIC_ANDROID_LIBRARIES := \
# android-support-design \
+# android-support-transition \
# android-support-v7-appcompat \
# android-support-v7-recyclerview \
-# android-support-compat \
-# android-support-core-utils \
-# android-support-core-ui \
-# android-support-fragment
+# android-support-v4
#
# in their makefiles to include the resources and their dependencies in their package.
include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true
LOCAL_MODULE := android-support-design
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-lollipop
-LOCAL_STATIC_ANDROID_LIBRARIES := android-support-design-res
+LOCAL_SRC_FILES := \
+ $(call all-java-files-under,base) \
+ $(call all-java-files-under,gingerbread) \
+ $(call all-java-files-under,honeycomb) \
+ $(call all-java-files-under,honeycomb-mr1) \
+ $(call all-java-files-under,ics) \
+ $(call all-java-files-under,lollipop) \
+ $(call all-java-files-under,src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SHARED_ANDROID_LIBRARIES := \
- $(resource_libs) \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment
-LOCAL_JAR_EXCLUDE_FILES := none
+ android-support-transition \
+ android-support-v7-appcompat \
+ android-support-v7-recyclerview \
+ android-support-v4 \
+ android-support-annotations
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-LOCAL_AAPT_FLAGS := --add-javadoc-annotation doconly
+LOCAL_AAPT_FLAGS := \
+ --no-version-vectors \
+ --add-javadoc-annotation doconly
include $(BUILD_STATIC_JAVA_LIBRARY)