summaryrefslogtreecommitdiff
path: root/library/common.mk
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-03-17 14:33:48 -0700
committerMaurice Lam <yukl@google.com>2015-03-17 14:33:48 -0700
commit2646e1d82ec6d133b35b775f044e156fca6d9d75 (patch)
tree410c1ab5bd74658ccf62da233f3665e0e9a03afc /library/common.mk
parent16a7a7a87ca9db68b1889b37ef46d65055195e7d (diff)
downloadsetupwizard-2646e1d82ec6d133b35b775f044e156fca6d9d75.tar.gz
[SetupWizardLib] Changed project hierarchy
Moved res-ics to ics/res, and res, src, AndroidManifest to main/. This fits more to the "canonical layout" expected by gradle, and works around the issue where blaze is expecting every res directory used by a target to be named the same (including its library dependencies and its transitive dependencies). Change-Id: I658e3c0a67a01f379c43d3fad82cd40f9aa8cd28
Diffstat (limited to 'library/common.mk')
-rw-r--r--library/common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/common.mk b/library/common.mk
index 6a62ead..fcf0ae2 100644
--- a/library/common.mk
+++ b/library/common.mk
@@ -12,6 +12,6 @@
# include frameworks/opt/setupwizard/library/common.mk
#
-LOCAL_RESOURCE_DIR += $(call my-dir)/res
+LOCAL_RESOURCE_DIR += $(call my-dir)/main/res
LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.setupwizardlib
LOCAL_STATIC_JAVA_LIBRARIES += setup-wizard-lib