More targeted dependencies
Change-Id: I76413b99f87bd0344e3105f9a98fd36c0d10a8c5
diff --git a/design/Android.mk b/design/Android.mk
index 38ca592..3217915 100644
--- a/design/Android.mk
+++ b/design/Android.mk
@@ -43,7 +43,10 @@
LOCAL_SRC_FILES := $(call all-java-files-under, base)
LOCAL_JAVA_LIBRARIES := \
android-support-design-res \
- android-support-v4 \
+ 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
@@ -57,7 +60,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-base
LOCAL_JAVA_LIBRARIES := \
android-support-design-res \
- android-support-v4 \
+ 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
@@ -71,7 +77,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-gingerbread
LOCAL_JAVA_LIBRARIES := \
android-support-design-res \
- android-support-v4 \
+ 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
@@ -85,7 +94,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-honeycomb
LOCAL_JAVA_LIBRARIES := \
android-support-design-res \
- android-support-v4 \
+ 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
@@ -99,7 +111,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-honeycomb-mr1
LOCAL_JAVA_LIBRARIES := \
android-support-design-res \
- android-support-v4 \
+ 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
@@ -114,7 +129,10 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-ics
LOCAL_JAVA_LIBRARIES := \
android-support-design-res \
- android-support-v4 \
+ 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
@@ -128,7 +146,10 @@
# android-support-design \
# android-support-v7-appcompat \
# android-support-v7-recyclerview \
-# android-support-v4
+# android-support-compat \
+# android-support-core-utils \
+# android-support-core-ui \
+# android-support-fragment
#
# in their makefiles to include the resources and their dependencies in their package.
include $(CLEAR_VARS)
@@ -138,7 +159,12 @@
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_SHARED_ANDROID_LIBRARIES := $(resource_libs) android-support-v4
+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
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
LOCAL_AAPT_FLAGS := --add-javadoc-annotation doconly
diff --git a/design/build.gradle b/design/build.gradle
index 8ae45d7..4423186 100644
--- a/design/build.gradle
+++ b/design/build.gradle
@@ -3,7 +3,10 @@
archivesBaseName = 'design'
dependencies {
- compile project(':support-v4')
+ compile project(':support-compat')
+ compile project(':support-core-utils')
+ compile project(':support-core-ui')
+ compile project(':support-fragment')
compile project(':support-appcompat-v7')
compile project(':support-recyclerview-v7')
compile project(':support-transition')
diff --git a/transition/Android.mk b/transition/Android.mk
index 4721533..4f51f3a 100644
--- a/transition/Android.mk
+++ b/transition/Android.mk
@@ -36,7 +36,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, base)
LOCAL_JAVA_LANGUAGE_VERSION := 1.7
LOCAL_JAVA_LIBRARIES := android-support-transition-res \
- android-support-v4
+ android-support-compat
include $(BUILD_STATIC_JAVA_LIBRARY)
# A helper sub-library that makes direct use of Ice Cream Sandwich APIs
@@ -46,7 +46,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, ics)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-transition-base
LOCAL_JAVA_LIBRARIES := android-support-transition-res \
- android-support-v4
+ android-support-compat
include $(BUILD_STATIC_JAVA_LIBRARY)
# A helper sub-library that makes direct use of KitKat APIs
@@ -56,7 +56,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, kitkat)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-transition-ics
LOCAL_JAVA_LIBRARIES := android-support-transition-res \
- android-support-v4
+ android-support-compat
include $(BUILD_STATIC_JAVA_LIBRARY)
# A helper sub-library that makes direct use of Lollipop APIs
@@ -66,7 +66,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, api21)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-transition-kitkat
LOCAL_JAVA_LIBRARIES := android-support-transition-res \
- android-support-v4
+ android-support-compat
include $(BUILD_STATIC_JAVA_LIBRARY)
# A helper sub-library that makes direct use of Marshmallow APIs
@@ -76,7 +76,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, api23)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-transition-api21
LOCAL_JAVA_LIBRARIES := android-support-transition-res \
- android-support-v4
+ android-support-compat
include $(BUILD_STATIC_JAVA_LIBRARY)
# Here is the final static library that apps can link against.
@@ -84,7 +84,7 @@
#
# LOCAL_STATIC_ANDROID_LIBRARIES := \
# android-support-transition \
-# android-support-v4
+# android-support-compat
#
# in their makefiles to include the resources and their dependencies in their package.
include $(CLEAR_VARS)
@@ -94,6 +94,6 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-transition-api23
LOCAL_STATIC_ANDROID_LIBRARIES := android-support-transition-res
-LOCAL_SHARED_ANDROID_LIBRARIES := android-support-v4
+LOCAL_SHARED_ANDROID_LIBRARIES := android-support-compat
LOCAL_JAR_EXCLUDE_FILES := none
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/transition/build.gradle b/transition/build.gradle
index faf8483..f06b0bd 100644
--- a/transition/build.gradle
+++ b/transition/build.gradle
@@ -3,7 +3,7 @@
archivesBaseName = 'transition'
dependencies {
- compile project(':support-v4')
+ compile project(':support-compat')
androidTestCompile ("com.android.support.test:runner:${project.rootProject.ext.testRunnerVersion}") {
exclude module: 'support-annotations'
diff --git a/transition/tests/src/android/support/transition/TransitionActivity.java b/transition/tests/src/android/support/transition/TransitionActivity.java
index 253e11a..ff9dbcc 100644
--- a/transition/tests/src/android/support/transition/TransitionActivity.java
+++ b/transition/tests/src/android/support/transition/TransitionActivity.java
@@ -16,13 +16,13 @@
package android.support.transition;
+import android.app.Activity;
import android.os.Bundle;
import android.support.transition.test.R;
-import android.support.v4.app.FragmentActivity;
import android.view.ViewGroup;
import android.widget.FrameLayout;
-public class TransitionActivity extends FragmentActivity {
+public class TransitionActivity extends Activity {
private FrameLayout mRoot;