Merge "Internal cleanup"
diff --git a/customtabs/Android.mk b/customtabs/Android.mk
index fb2f354..0d48860 100644
--- a/customtabs/Android.mk
+++ b/customtabs/Android.mk
@@ -25,7 +25,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-Iaidl-files-under, src)
LOCAL_JAVA_LIBRARIES := android-support-annotations \
-android-support-v4
+android-support-compat
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/customtabs/build.gradle b/customtabs/build.gradle
index 65a3e6f..82e536b 100644
--- a/customtabs/build.gradle
+++ b/customtabs/build.gradle
@@ -3,7 +3,7 @@
archivesBaseName = 'customtabs'
dependencies {
- compile project(':support-v4')
+ compile project(':support-compat')
compile project(':support-annotations')
androidTestCompile ('com.android.support.test:runner:0.4.1') {
diff --git a/graphics/drawable/Android.mk b/graphics/drawable/Android.mk
index d89d24f..4a76290 100644
--- a/graphics/drawable/Android.mk
+++ b/graphics/drawable/Android.mk
@@ -24,7 +24,7 @@
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under, static/src)
-LOCAL_JAVA_LIBRARIES := android-support-v4
+LOCAL_JAVA_LIBRARIES := android-support-compat
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -48,7 +48,7 @@
LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION)
LOCAL_SRC_FILES := $(call all-java-files-under, animated/src)
-LOCAL_JAVA_LIBRARIES := android-support-v4 android-support-vectordrawable
+LOCAL_JAVA_LIBRARIES := android-support-compat android-support-vectordrawable
LOCAL_AAPT_FLAGS := --no-version-vectors
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index 845686d..3976438 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle
@@ -3,7 +3,7 @@
archivesBaseName = 'support-vector-drawable'
dependencies {
- compile project(':support-v4')
+ compile project(':support-compat')
androidTestCompile ('com.android.support.test:runner:0.4.1') {
exclude module: 'support-annotations'
}
diff --git a/media-compat/Android.mk b/media-compat/Android.mk
index 27d4098..4e7ded7 100644
--- a/media-compat/Android.mk
+++ b/media-compat/Android.mk
@@ -56,25 +56,12 @@
# -----------------------------------------------------------------------
-# A helper sub-library that makes direct use of V20 APIs.
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-media-compat-api20
-LOCAL_SDK_VERSION := 20
-LOCAL_SRC_FILES := $(call all-java-files-under, api20)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-media-compat-kitkat
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-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-media-compat-api21
LOCAL_SDK_VERSION := 21
LOCAL_SRC_FILES := $(call all-java-files-under, api21)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-media-compat-api20
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-media-compat-kitkat
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/v4/Android.mk b/v4/Android.mk
index 556eb99..559b5bd 100644
--- a/v4/Android.mk
+++ b/v4/Android.mk
@@ -45,38 +45,12 @@
# -----------------------------------------------------------------------
-# A helper sub-library that makes direct use of Ice Cream Sandwich APIs.
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-core-utils-ics
-LOCAL_SDK_VERSION := 14
-LOCAL_SRC_FILES := $(call all-java-files-under, ics)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-honeycomb
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-support_module_src_files += $(LOCAL_SRC_FILES)
-
-# -----------------------------------------------------------------------
-
# A helper sub-library that makes direct use of JellyBean APIs.
include $(CLEAR_VARS)
LOCAL_MODULE := android-support-core-utils-jellybean
LOCAL_SDK_VERSION := 16
LOCAL_SRC_FILES := $(call all-java-files-under, jellybean)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-ics
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-support_module_src_files += $(LOCAL_SRC_FILES)
-
-# -----------------------------------------------------------------------
-
-# A helper sub-library that makes direct use of JellyBean MR2 APIs.
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-core-utils-jellybean-mr2
-LOCAL_SDK_VERSION := 18
-LOCAL_SRC_FILES := $(call all-java-files-under, jellybean-mr2)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-jellybean
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-honeycomb
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -89,7 +63,7 @@
LOCAL_MODULE := android-support-core-utils-kitkat
LOCAL_SDK_VERSION := 19
LOCAL_SRC_FILES := $(call all-java-files-under, kitkat)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-jellybean-mr2
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-jellybean
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -123,25 +97,12 @@
# -----------------------------------------------------------------------
-# A helper sub-library that makes direct use of V22 APIs.
-include $(CLEAR_VARS)
-LOCAL_MODULE := android-support-core-utils-api22
-LOCAL_SDK_VERSION := 22
-LOCAL_SRC_FILES := $(call all-java-files-under, api22)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-api21
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-support_module_src_files += $(LOCAL_SRC_FILES)
-
-# -----------------------------------------------------------------------
-
# A helper sub-library that makes direct use of V23 APIs.
include $(CLEAR_VARS)
LOCAL_MODULE := android-support-core-utils-api23
LOCAL_SDK_VERSION := 23
LOCAL_SRC_FILES := $(call all-java-files-under, api23)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-api22
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-core-utils-api21
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/v7/gridlayout/Android.mk b/v7/gridlayout/Android.mk
index da68275..779946e 100644
--- a/v7/gridlayout/Android.mk
+++ b/v7/gridlayout/Android.mk
@@ -19,7 +19,8 @@
#
# LOCAL_STATIC_ANDROID_LIBRARIES := \
# android-support-v7-gridlayout \
-# android-support-v4
+# android-support-compat \
+# android-support-core-ui
#
# in their makefiles to include the resources and their dependencies in their package.
include $(CLEAR_VARS)
@@ -28,7 +29,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SDK_VERSION := 9
-LOCAL_SHARED_ANDROID_LIBRARIES := android-support-v4
+LOCAL_SHARED_ANDROID_LIBRARIES += android-support-compat android-support-core-ui
LOCAL_JAR_EXCLUDE_FILES := none
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
LOCAL_AAPT_FLAGS := --add-javadoc-annotation doconly
diff --git a/v7/gridlayout/build.gradle b/v7/gridlayout/build.gradle
index 7cae6c3..5410363 100644
--- a/v7/gridlayout/build.gradle
+++ b/v7/gridlayout/build.gradle
@@ -3,7 +3,8 @@
archivesBaseName = 'gridlayout-v7'
dependencies {
- compile project(':support-v4')
+ compile project(':support-compat')
+ compile project(':support-core-ui')
androidTestCompile ('com.android.support.test:runner:0.4.1') {
exclude module: 'support-annotations'
diff --git a/v7/palette/Android.mk b/v7/palette/Android.mk
index bf57ce3..4261099 100644
--- a/v7/palette/Android.mk
+++ b/v7/palette/Android.mk
@@ -19,7 +19,8 @@
#
# LOCAL_STATIC_ANDROID_LIBRARIES := \
# android-support-v7-palette \
-# android-support-v4
+# android-support-compat \
+# android-support-core-utils
#
# in their makefiles to include the resources and their dependencies in their package.
include $(CLEAR_VARS)
@@ -29,7 +30,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_MANIFEST_FILE := src/main/AndroidManifest.xml
-LOCAL_SHARED_ANDROID_LIBRARIES += android-support-v4
+LOCAL_SHARED_ANDROID_LIBRARIES += android-support-compat android-support-core-utils
LOCAL_JAR_EXCLUDE_FILES := none
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
LOCAL_AAPT_FLAGS := --add-javadoc-annotation doconly
diff --git a/v7/palette/build.gradle b/v7/palette/build.gradle
index 09fd7fd..b87a842 100644
--- a/v7/palette/build.gradle
+++ b/v7/palette/build.gradle
@@ -3,7 +3,8 @@
archivesBaseName = 'palette-v7'
dependencies {
- compile project(':support-v4')
+ compile project(':support-compat')
+ compile project(':support-core-utils')
androidTestCompile ('com.android.support.test:runner:0.4.1') {
exclude module: 'support-annotations'
diff --git a/v7/recyclerview/Android.mk b/v7/recyclerview/Android.mk
index 328c761..7f885e9 100644
--- a/v7/recyclerview/Android.mk
+++ b/v7/recyclerview/Android.mk
@@ -19,7 +19,8 @@
#
# LOCAL_STATIC_ANDROID_LIBRARIES := \
# android-support-v7-recycler-view \
-# android-support-v4 \
+# android-support-compat \
+# android-support-core-ui \
# android-support-annotations
#
# in their makefiles to include the resources and their dependencies in their package.
@@ -31,7 +32,8 @@
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_SHARED_ANDROID_LIBRARIES := \
- android-support-v4 \
+ android-support-compat \
+ android-support-core-ui \
android-support-annotations
LOCAL_JAR_EXCLUDE_FILES := none
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
diff --git a/v7/recyclerview/build.gradle b/v7/recyclerview/build.gradle
index ac29032..7a6391e 100644
--- a/v7/recyclerview/build.gradle
+++ b/v7/recyclerview/build.gradle
@@ -3,8 +3,9 @@
archivesBaseName = 'recyclerview-v7'
dependencies {
- compile project(':support-v4')
compile project(':support-annotations')
+ compile project(':support-compat')
+ compile project(':support-core-ui')
androidTestCompile ('com.android.support.test:runner:0.4.1') {
exclude module: 'support-annotations'
}