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

Commit afdde6b4 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Add missing transitive dependencies" am: ec520cf7 

am: 40f13876

Change-Id: I200740e8a425fbe83b87680b0abab5a4425545a4
parents 0b111ab7 40f13876

Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ LOCAL_RESOURCE_DIR += frameworks/opt/datetimepicker/res 
ifeq ($(TARGET_BUILD_APPS),)

LOCAL_RESOURCE_DIR += frameworks/support/design/res

LOCAL_RESOURCE_DIR += frameworks/support/percent/res

LOCAL_RESOURCE_DIR += frameworks/support/transition/res

LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res

LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res

LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res
@@ -15,6 +16,7 @@ LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res 
else

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/design/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/percent/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/transition/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v14/preference/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res
@@ -37,6 +39,7 @@ LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguar 
LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker

LOCAL_STATIC_JAVA_LIBRARIES += android-support-design

LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent

LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
@@ -47,6 +50,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview 
LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS += --extra-packages android.support.design

LOCAL_AAPT_FLAGS += --extra-packages android.support.percent

LOCAL_AAPT_FLAGS += --extra-packages android.support.transition

LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout