Merge Android with master

diff --git a/driver/Kbuild b/driver/Kbuild
index c02e4a6..4ca0f06 100644 (file)
--- a/driver/Kbuild
+++ b/driver/Kbuild
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS := -I$(src)/../../common -I$(src)/../../profile -DEC_ARCH_$(ARCH) -D__DEBUG -D__DISABLE_RELAYFS $(memchecker) $(debug_opt)
+EXTRA_CFLAGS := -I$(src)/../../common -I$(src)/../../profile -DEC_ARCH_$(ARCH) -D__DEBUG -D__DISABLE_RELAYFS $(memchecker) $(debug_opt) $(android_opt)
 
 obj-m := inperfa_driver.o
 inperfa_driver-y := device_driver.o ec.o legacy.o module.o probes.o probes_manager.o storage.o us_proc_inst.o

diff --git a/driver/Makefile b/driver/Makefile
index 916f4ce..6bab98a 100644 (file)
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,18 +1,18 @@
 target_kernel_src = @KERNEL@
 target_arch = @ARCH@
-board = @BOARD@
+#board = @BOARD@
 driver_module_dir = $(realpath $(srcdir))
 module_name = inperfa_driver
 cross_compiler = $(subst gcc,,$(CC))
 
 all-local:
        cp $(top_srcdir)/src/modules/kprobe/Module.symvers $(driver_module_dir)
-       $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) memchecker=$(memchecker) debug_opt=$(debug_opt) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(driver_module_dir) modules
+       $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) memchecker=$(memchecker) android_opt=$(android_opt) debug_opt=$(debug_opt) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(driver_module_dir) modules
 
 clean-local:
        $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(driver_module_dir) clean
 
 install-exec-local:
        install -m 644 $(driver_module_dir)/$(module_name).ko $(prefix)
-       if [ "$(board)" != "beagle_eclair" ] ; then install -m 755 $(driver_module_dir)/$(module_name).sh $(prefix) ; fi
+       if [ "$(android)" != "yes" ] ; then install -m 755 $(driver_module_dir)/$(module_name).sh $(prefix) ; fi
 

diff --git a/driver/Makefile.am b/driver/Makefile.am
index f3b7eea..0996e2a 100644 (file)
--- a/driver/Makefile.am
+++ b/driver/Makefile.am
@@ -6,4 +6,9 @@ if DEBUG
 debug_opt = -D__DEBUG
 endif
 
+if ANDROID
+android_opt = -D__ANDROID
+android = yes
+endif
+
 include Makefile

diff --git a/driver/us_proc_inst.c b/driver/us_proc_inst.c
index 3e183c3..7e11537 100644 (file)
--- a/driver/us_proc_inst.c
+++ b/driver/us_proc_inst.c
@@ -331,21 +331,21 @@ static int install_mapped_ips (struct task_struct *task, inst_us_proc_t* task_in
        vma = mm->mmap;
        while (vma) {
                // skip non-text section
-#ifndef ANDROID
+#ifndef __ANDROID
          if (!(vma->vm_flags & VM_EXEC) || !vma->vm_file || (vma->vm_flags & VM_ACCOUNT) ||
                  !(vma->vm_flags & (VM_WRITE | VM_MAYWRITE)) ||
                  !(vma->vm_flags & (VM_READ | VM_MAYREAD))) {
-#else
+#else // __ANDROID
          if (!(vma->vm_flags & VM_EXEC) || !vma->vm_file /*|| (vma->vm_flags & VM_ACCOUNT)*/ /*||
                  !(vma->vm_flags & (VM_WRITE | VM_MAYWRITE)) ||
                  !(vma->vm_flags & (VM_READ | VM_MAYREAD))*/) {
-#endif
+#endif // __ANDROID
                        vma = vma->vm_next;
                        continue;
                }
-#ifdef ANDROID
+#ifdef __ANDROID
            vma->vm_flags |= (VM_WRITE | VM_MAYWRITE | VM_READ | VM_MAYREAD);
-#endif
+#endif // __ANDROID
 
                /**
                 * After process was forked, some time it inherits parent process environment.

diff --git a/kprobe/Makefile b/kprobe/Makefile
index c0508e3..1e8e1ab 100644 (file)
--- a/kprobe/Makefile
+++ b/kprobe/Makefile
@@ -1,5 +1,5 @@
 target_kernel_src = @KERNEL@
-board = @BOARD@
+#board = @BOARD@
 kprobes_module_dir = $(realpath $(top_srcdir)/src/modules/kprobe)
 module_name = inperfa_kprobe
 cross_compiler = $(subst gcc,,$(CC))
@@ -12,5 +12,5 @@ clean-local:
 
 install-exec-local:
        install -m 644 $(kprobes_module_dir)/$(module_name).ko $(prefix)
-       if [ "$(board)" != "beagle_eclair" ] ; then install -m 755 $(kprobes_module_dir)/$(module_name).sh $(prefix) ; fi
+       if [ "$(android)" != "yes" ] ; then install -m 755 $(kprobes_module_dir)/$(module_name).sh $(prefix) ; fi
 

diff --git a/kprobe/Makefile.am b/kprobe/Makefile.am
index 2b0b5ab..0b324e3 100644 (file)
--- a/kprobe/Makefile.am
+++ b/kprobe/Makefile.am
@@ -1 +1,6 @@
+if ANDROID
+android_opt = -D__ANDROID
+android = yes
+endif
+
 include Makefile