summaryrefslogtreecommitdiffstats
path: root/library/Android.mk
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-03-18 21:41:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-18 21:41:55 +0000
commit20a4f1ac5bd26e02563fd9ea85fc25e2d1d27d3b (patch)
treecc32460b2441c106dd3e87b0633f4904d8a5b643 /library/Android.mk
parent63b29a6d02dfee2e961f302186fb2dea5927427b (diff)
parent2646e1d82ec6d133b35b775f044e156fca6d9d75 (diff)
downloadandroid_frameworks_opt_setupwizard-20a4f1ac5bd26e02563fd9ea85fc25e2d1d27d3b.tar.gz
android_frameworks_opt_setupwizard-20a4f1ac5bd26e02563fd9ea85fc25e2d1d27d3b.tar.bz2
android_frameworks_opt_setupwizard-20a4f1ac5bd26e02563fd9ea85fc25e2d1d27d3b.zip
am 2646e1d8: [SetupWizardLib] Changed project hierarchy
* commit '2646e1d82ec6d133b35b775f044e156fca6d9d75': [SetupWizardLib] Changed project hierarchy
Diffstat (limited to 'library/Android.mk')
-rw-r--r--library/Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/library/Android.mk b/library/Android.mk
index 1c43edb..cd5462c 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -2,8 +2,9 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SDK_VERSION := current
+LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
LOCAL_MODULE := setup-wizard-lib
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/main/res
+LOCAL_SRC_FILES := $(call all-java-files-under, main/src)
include $(BUILD_STATIC_JAVA_LIBRARY)