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

Commit 8a4a6153 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Add android.support.v7.recyclerview resource"

parents 1ad0c3bf 94252de3

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/libinputflingerhost.so $(PR 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libinputflingerhost_intermediates $(PRODUCT_OUT)/obj_arm/SHARED_LIBRARIES/libinputflingerhost_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/DocumentsUI_intermediates)



# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

packages/DocumentsUI/Android.mk

+10 −6
Original line number Diff line number Diff line
@@ -17,13 +17,17 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 
# Not quite sure why it is necessary to explicitly pull in resources from the

# appcompat lib, but the demo code indicates it's necessary (see

# development/samples/Support7Demos/Android.mk)

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

LOCAL_RESOURCE_DIR += frameworks/support/design/res

LOCAL_RESOURCE_DIR += \

  frameworks/support/v7/appcompat/res \

  frameworks/support/design/res \

  frameworks/support/v7/recyclerview/res



# Again, required to pull in appcompat resources.  See abovementioned demo code.

LOCAL_AAPT_FLAGS := --auto-add-overlay

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

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

LOCAL_AAPT_FLAGS := \

  --auto-add-overlay \

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

  --extra-packages android.support.design \

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



LOCAL_PACKAGE_NAME := DocumentsUI

LOCAL_CERTIFICATE := platform