Merge legacy branch

git-core · git-core · commit 815edac93007 · 2012-01-11T23:55:01.000+04:00
diff --git a/Android.mk b/Android.mk
@@ -4,17 +4,19 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := su
 LOCAL_SRC_FILES := su.c db.c activity.cpp
 
+SU_SHARED_LIBRARIES := liblog libsqlite
+ifeq ($(PLATFORM_SDK_VERSION),4)
+	LOCAL_CFLAGS += -DSU_LEGACY_BUILD
+	SU_SHARED_LIBRARIES += libandroid_runtime
+else
+	SU_SHARED_LIBRARIES += libcutils libbinder libutils
+	LOCAL_MODULE_TAGS := debug,eng
+endif
 
 LOCAL_C_INCLUDES += external/sqlite/dist
 
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libsqlite \
-    libcutils \
-    libbinder \
-    libutils \
+LOCAL_SHARED_LIBRARIES := $(SU_SHARED_LIBRARIES)
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug,eng
 
 include $(BUILD_EXECUTABLE)
diff --git a/activity.cpp b/activity.cpp
@@ -17,9 +17,15 @@
 
 #include <unistd.h>
 #include <android_runtime/ActivityManager.h>
+#ifdef SU_LEGACY_BUILD
+#include <utils/IBinder.h>
+#include <utils/IServiceManager.h>
+#include <utils/Parcel.h>
+#else
 #include <binder/IBinder.h>
 #include <binder/IServiceManager.h>
 #include <binder/Parcel.h>
+#endif
 #include <utils/String8.h>
 #include <assert.h>
 
diff --git a/su.h b/su.h
@@ -27,7 +27,13 @@
 
 #define DEFAULT_COMMAND "/system/bin/sh"
 
-#define VERSION "3.0.3.2"
+#ifdef SU_LEGACY_BUILD
+#define VERSION_EXTRA	"l"
+#else
+#define VERSION_EXTRA	""
+#endif
+
+#define VERSION "3.0.3.2" VERSION_EXTRA
 #define VERSION_CODE 15
 
 #define DATABASE_VERSION 6
