commit 3212a1965ea3b765f7066b51814a54bcc5de7fa7
author Dima Zavin <dima@android.com> Tue Aug 07 11:03:13 2012 -0700
committer Dima Zavin <dima@android.com> Tue Aug 07 23:42:53 2012 -0700
tree cfb2fa8429f84bfad604863c08c1678655e19617
parent 4e9e8c9c0169b40318386436d762c3d73cf4c328

exynos5: mobicore: cleanup of makefiles

Change-Id: I7936d6f4dbe88f73280deb2118915b46a8a3565c
Signed-off-by: Dima Zavin <dima@android.com>

exynos5.mk

diff --git a/exynos5.mk b/exynos5.mk
index 2776260..880246f 100644
--- a/exynos5.mk
+++ b/exynos5.mk
@@ -33,8 +33,4 @@
 
 # MobiCore
 PRODUCT_PACKAGES += \
-	libMcClient \
-	libMcRegistry \
-	libPaApi \
-	mcDriverDaemon \
-	gdmcprov
+	mcDriverDaemon

mobicore/Android.mk

diff --git a/mobicore/Android.mk b/mobicore/Android.mk
old mode 100755
new mode 100644
index 9d7f28c..f30202c
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -17,9 +17,9 @@
     $(COMP_PATH_MobiCore)/inc/TlCm \
     $(MOBICORE_PROJECT_PATH)/daemon/ClientLib/public \
     $(MOBICORE_PROJECT_PATH)/daemon/Registry/Public
+
 MC_DEBUG := _DEBUG
-SYSTEM_LIB_DIR=/system/lib
-GDM_PROVLIB_SHARED_LIBS=libMcClient
+
 # Include the provisioning lib
 include $(MOBICORE_PROJECT_PATH)/provlib/Android.mk
 

mobicore/provlib/Android.mk

diff --git a/mobicore/provlib/Android.mk b/mobicore/provlib/Android.mk
index f66549c..f269e80 100644
--- a/mobicore/provlib/Android.mk
+++ b/mobicore/provlib/Android.mk
@@ -4,9 +4,7 @@
 #
 # =============================================================================
 
-PROJECT_PATH := $(call my-dir)
-
-$(call import-module,$(COMP_PATH_MobiCoreDriverLib))
+LOCAL_PATH := $(call my-dir)
 
 # Include the Scripts
-include $(PROJECT_PATH)/jni/Android.mk
\ No newline at end of file
+include $(LOCAL_PATH)/src/Android.mk

mobicore/provlib/src/Android.mk

diff --git a/mobicore/provlib/jni/Android.mk b/mobicore/provlib/src/Android.mk
similarity index 73%
rename from mobicore/provlib/jni/Android.mk
rename to mobicore/provlib/src/Android.mk
index 34971ab..db2bd01 100644
--- a/mobicore/provlib/jni/Android.mk
+++ b/mobicore/provlib/src/Android.mk
@@ -3,16 +3,16 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE      := gdmcprov
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_C_INCLUDES  := $(LOCAL_PATH)/../inc_private \
                      $(LOCAL_PATH)/../inc_public \
                      $(MC_INCLUDE_DIR)
 
-LOCAL_SRC_FILES   := ../src/gdmcprovlib.cpp \
-                     ../src/crc32.c \
-                     ../src/mobicore.c \
-                     ../src/gdmcdevicebinding.cpp
+LOCAL_SRC_FILES   := gdmcprovlib.cpp \
+                     crc32.c \
+                     mobicore.c \
+                     gdmcdevicebinding.cpp
 
 LOCAL_CFLAGS      := -O2 -Wall -fomit-frame-pointer -DANDROID_ARM -DARM -D_LENDIAN -D_32BIT \
                      -fvisibility=hidden -I$(OPENSSL_INC_DIR) \
@@ -27,10 +27,6 @@
                      -fvisibility-inlines-hidden -fvisibility=hidden \
                      -DGDMCPROVLIB_VERSION=0x01000001 -D$(MC_DEBUG)
 
-LOCAL_LDFLAGS     := -Wl,-rpath-link,$(SYSTEM_LIB_DIR) \
-                     -L$(SYSTEM_LIB_DIR)
-
-LOCAL_SHARED_LIBRARIES  := $(GDM_PROVLIB_SHARED_LIBS)
+LOCAL_SHARED_LIBRARIES  := libMcClient
 
 include $(BUILD_SHARED_LIBRARY)
-