Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 062d1d5b authored by Colin Cross's avatar Colin Cross
Browse files

Add missing transitive dependencies 

Add android-support-transition to DocumentsUI for
android-support-design, android-support-annotations to
ExternalStorageProvider for android-support-documents-archive, and
android support libraries to SettingsLib/common.mk.

Test: builds
Merged-In: Ib62a5dd6ee1cf39c99c9cce3a9310c35cf631fdf
Change-Id: Ib62a5dd6ee1cf39c99c9cce3a9310c35cf631fdf
parent be2d3307

packages/DocumentsUI/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat 
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

# Supplies material design components, e.g. Snackbar.

LOCAL_STATIC_JAVA_LIBRARIES += android-support-design

LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview

LOCAL_STATIC_JAVA_LIBRARIES += guava
@@ -22,6 +23,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 
LOCAL_RESOURCE_DIR += \

  frameworks/support/v7/appcompat/res \

  frameworks/support/design/res \

  frameworks/support/transition/res \

  frameworks/support/v7/recyclerview/res



# Again, required to pull in appcompat resources.  See abovementioned demo code.
@@ -29,6 +31,7 @@ LOCAL_AAPT_FLAGS := \ 
  --auto-add-overlay \

  --extra-packages android.support.v7.appcompat \

  --extra-packages android.support.design \

  --extra-packages android.support.transition \

  --extra-packages android.support.v7.recyclerview



LOCAL_JACK_FLAGS := \

packages/ExternalStorageProvider/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_STATIC_JAVA_LIBRARIES := android-support-documents-archive

LOCAL_STATIC_JAVA_LIBRARIES :=  \

    android-support-documents-archive \

    android-support-annotations



LOCAL_PACKAGE_NAME := ExternalStorageProvider

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true

packages/SettingsLib/common.mk

+4 −0
Original line number Diff line number Diff line
@@ -24,5 +24,9 @@ LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.settingslib 
LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-annotations \

    android-support-v4 \

    android-support-v7-appcompat \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v14-preference \

    SettingsLib

endif