X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.mk;h=b2ffa82d6cdd57e03989fa3651ef24b0d41ff826;hb=refs%2Fheads%2Fjb-x86;hp=597b881646482f4408b668b4f3347bffec5c8c66;hpb=70d51694d97f33ac2dc9df914d49f287be919cd3;p=android-x86%2Fexternal-koush-Superuser.git

diff --git a/Android.mk b/Android.mk
index 597b881..b2ffa82 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,6 @@
 # su is built here, and 
 
 my_path := $(call my-dir)
-LOCAL_PATH := $(my_path)
 
 ifdef SUPERUSER_EMBEDDED
 SUPERUSER_PACKAGE := com.android.settings
@@ -14,12 +13,13 @@ include $(my_path)/Superuser/Android.mk
 endif
 
 
+LOCAL_PATH := $(my_path)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := su
-LOCAL_MODULE_TAGS := eng debug
+LOCAL_MODULE_TAGS := eng debug optional
 LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_STATIC_LIBRARIES := libc
+LOCAL_STATIC_LIBRARIES := libc libcutils
 LOCAL_C_INCLUDES := external/sqlite/dist
 LOCAL_SRC_FILES := Superuser/jni/su/su.c Superuser/jni/su/daemon.c Superuser/jni/su/activity.c Superuser/jni/su/db.c Superuser/jni/su/utils.c ../../sqlite/dist/sqlite3.c
 LOCAL_CFLAGS := -DSQLITE_OMIT_LOAD_EXTENSION -DREQUESTOR=\"$(SUPERUSER_PACKAGE)\"
@@ -28,17 +28,20 @@ ifdef SUPERUSER_PACKAGE_PREFIX
   LOCAL_CFLAGS += -DREQUESTOR_PREFIX=\"$(SUPERUSER_PACKAGE_PREFIX)\"
 endif
 
+ifdef SUPERUSER_EMBEDDED
+  LOCAL_CFLAGS += -DSUPERUSER_EMBEDDED
+endif
+
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 include $(BUILD_EXECUTABLE)
 
 
 SYMLINKS := $(addprefix $(TARGET_OUT)/bin/,su)
-$(SYMLINKS): $(LOCAL_MODULE)
-$(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
+$(SYMLINKS):
 	@echo "Symlink: $@ -> /system/xbin/su"
 	@mkdir -p $(dir $@)
 	@rm -rf $@
-	$(hide) ln -sf /system/xbin/su $@
+	$(hide) ln -sf ../xbin/su $@
 
 ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS)
 
@@ -53,21 +56,16 @@ ifdef SUPERUSER_EMBEDDED
 # init.rc or similar
 
 SUPERUSER_RC := $(TARGET_ROOT_OUT)/init.superuser.rc
-$(SUPERUSER_RC): $(LOCAL_MODULE)
-$(SUPERUSER_RC): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) cp external/koush/Superuser/init.superuser.rc $@
-
+$(SUPERUSER_RC): $(LOCAL_PATH)/init.superuser.rc | $(ACP)
+	$(copy-file-to-new-target)
 
 SUPERUSER_MARKER := $(TARGET_OUT_ETC)/.has_su_daemon
-$(SUPERUSER_MARKER): $(LOCAL_MODULE)
-$(SUPERUSER_MARKER): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
+$(SUPERUSER_MARKER): $(LOCAL_INSTALLED_MODULE)
 	@mkdir -p $(dir $@)
 	@rm -rf $@
 	$(hide) touch $@
 
 ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
-    $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(TARGET_ROOT_OUT)/init.superuser.rc $(TARGET_OUT_ETC)/.has_su_daemon
+    $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SUPERUSER_RC) $(SUPERUSER_MARKER)
 
 endif