Improvements for ICS/JB conditions in the Makefile

zzuli4519 · Nov 27, 2012 · daf008a · daf008a
1 parent 19783bc
commit daf008a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/Android.mk b/Android.mk
@@ -13,6 +13,10 @@ LOCAL_SHARED_LIBRARIES := \
 	libdvm \
 	libstlport
 
+ifneq ($(PLATFORM_SDK_VERSION),15)
+LOCAL_SHARED_LIBRARIES += libandroidfw
+endif
+
 LOCAL_STATIC_LIBRARIES += libbz
 
 LOCAL_C_INCLUDES += dalvik \
@@ -24,16 +28,11 @@ LOCAL_C_INCLUDES += dalvik \
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_CFLAGS += -DWITH_JIT
+LOCAL_CFLAGS += -DWITH_JIT -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 
-# use "mm xposed_target=ics" to compile this in pre-JB source tree for ICS
-ifeq ($(xposed_target),ics)
-LOCAL_MODULE := xposed_ics
-LOCAL_CFLAGS += -DXPOSED_TARGET_ICS
-else
-LOCAL_SHARED_LIBRARIES += libandroidfw
 LOCAL_MODULE := xposed
-endif
+
+LOCAL_MODULE_STEM := xposed_sdk$(PLATFORM_SDK_VERSION)
 
 include $(BUILD_EXECUTABLE)
 

diff --git a/xposed.cpp b/xposed.cpp
@@ -10,7 +10,7 @@
 #include <android_runtime/AndroidRuntime.h>
 
 #define private public
-#ifdef XPOSED_TARGET_ICS
+#if PLATFORM_SDK_VERSION == 15
 #include <utils/ResourceTypes.h>
 #else
 #include <androidfw/ResourceTypes.h>

diff --git a/xposed.h b/xposed.h
@@ -18,7 +18,7 @@ namespace android {
 #define XPOSED_LIB_COPY_RETRIES 5
 #define XPOSED_VERSION "24"
 
-#ifdef XPOSED_TARGET_ICS
+#ifndef ALOGD
 #define ALOGD LOGD
 #define ALOGE LOGE
 #define ALOGI LOGI