Update project name and resource include directories
Change-Id: Ib597e26141d88d707c8a8faf1f1d2bd521d319bb
diff --git a/Android.mk b/Android.mk
index 2bca597..dd86146 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE := android-common-chips
+LOCAL_MODULE := libchips
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_SDK_VERSION := 19
LOCAL_SRC_FILES := \
diff --git a/sample/Android.mk b/sample/Android.mk
index 978aa7f..d5eef30 100644
--- a/sample/Android.mk
+++ b/sample/Android.mk
@@ -25,7 +25,7 @@
src_dirs := src
LOCAL_PACKAGE_NAME := ChipsSample
-LOCAL_STATIC_JAVA_LIBRARIES += android-common-chips
+LOCAL_STATIC_JAVA_LIBRARIES += libchips
LOCAL_SDK_VERSION := 18
diff --git a/tests/Android.mk b/tests/Android.mk
index b01aa0c..98c338a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,8 +20,8 @@
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
-LOCAL_STATIC_JAVA_LIBRARIES += android-common-chips
-LOCAL_RESOURCE_DIR := frameworks/ex/chips/res/
+LOCAL_STATIC_JAVA_LIBRARIES += libchips
+LOCAL_RESOURCE_DIR := frameworks/opt/chips/res/
LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips