diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-07-22 23:39:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-22 23:39:46 +0000 |
| commit | 5b11d540a967d4ad3c86f2860efaa500f89bac63 (patch) | |
| tree | 0a9da7b4b0fc31a002e0afb885a1b4ee51b60f8a | |
| parent | bd7821fa5de94a57963ffa0b0e28912b42ccd30d (diff) | |
| parent | eb0caa866775e0644decf81a2c4ea14c758a96fc (diff) | |
| download | photoviewer-5b11d540a967d4ad3c86f2860efaa500f89bac63.tar.gz | |
am eb0caa86: Build against current.
* commit 'eb0caa866775e0644decf81a2c4ea14c758a96fc':
Build against current.
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | sample/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir) # This is to allow the library to be loaded dynamically in a context where # the required libraries already exist. You should only use this library # if you're certain that you need it; see go/extradex-design for more context. -appcompat_res_dirs := appcompat/res res ../../support/v7/appcompat/res +appcompat_res_dirs := appcompat/res res ../../../prebuilts/sdk/current/support/v7/appcompat/res include $(CLEAR_VARS) LOCAL_MODULE := libphotoviewer_appcompat_dynamic diff --git a/sample/Android.mk b/sample/Android.mk index cff9bc3..8fb912b 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -41,7 +41,7 @@ include $(BUILD_PACKAGE) #Include res dir from photoviewer photo_dir := ../res ../appcompat/res -res_dirs := $(photo_dir) res ../../../support/v7/appcompat/res +res_dirs := $(photo_dir) res ../../../../prebuilts/sdk/current/support/v7/appcompat/res # Build APK include $(CLEAR_VARS) |