diff options
-rw-r--r-- | CleanSpec.mk | 1 | ||||
-rw-r--r-- | packages/DocumentsUI/Android.mk | 16 |
2 files changed, 11 insertions, 6 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 48be749a5b37..6e44d77751d5 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 diff --git a/packages/DocumentsUI/Android.mk b/packages/DocumentsUI/Android.mk index c21c5cc5e61f..1a4e3eb18e14 100644 --- a/packages/DocumentsUI/Android.mk +++ b/packages/DocumentsUI/Android.mk @@ -13,17 +13,21 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-design LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview LOCAL_STATIC_JAVA_LIBRARIES += guava -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +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 |