diff --git a/lite/tools/build_android.sh b/lite/tools/build_android.sh
index f3dceb9..cf8efac 100755
--- a/lite/tools/build_android.sh
+++ b/lite/tools/build_android.sh
@@ -76,7 +76,7 @@ WITH_CONVERT_TO_SSA=ON
 # use Arm DNN library instead of built-in math library, defaults to OFF.
 WITH_ARM_DNN_LIBRARY=OFF
 # num of threads used during compiling..
-readonly NUM_PROC=${LITE_BUILD_THREADS:-4}
+readonly NUM_PROC=32 
 
@@ -206,9 +206,6 @@ function make_tiny_publish_so {
 
   # Step1. Create directory for compiling.
   build_dir=$workspace/build.lite.android.$ARCH.$TOOLCHAIN
-  if [ -d $build_dir ]; then
-      rm -rf $build_dir
-  fi
   mkdir -p $build_dir
   cd $build_dir
 
diff --git a/lite/tools/build_linux.sh b/lite/tools/build_linux.sh
index ace7a8b..d3df143 100755
--- a/lite/tools/build_linux.sh
+++ b/lite/tools/build_linux.sh
@@ -100,7 +100,7 @@ WITH_BENCHMARK=OFF
 # use Arm DNN library instead of built-in math library, defaults to OFF.
 WITH_ARM_DNN_LIBRARY=OFF
 # num of threads used during compiling..
-readonly NUM_PROC=${LITE_BUILD_THREADS:-4}
+readonly NUM_PROC=32 
 
@@ -344,9 +344,6 @@ function make_publish_so {
         build_dir=${build_dir}.kunlunxin_xpu
     fi
 
-    if [ -d $build_dir ]; then
-        rm -rf $build_dir
-    fi
     mkdir -p $build_dir
     cd $build_dir

diff --git a/cmake/os/android.cmake b/cmake/os/android.cmake
index 79fdbd8..7de771f 100644
--- a/cmake/os/android.cmake
+++ b/cmake/os/android.cmake
@@ -16,6 +16,7 @@ set(ANDROID TRUE)
 set(ANDROID_ARCH_ABI_LIST "arm64-v8a" "armeabi-v7a" "armeabi-v6" "armeabi" "mips" "mips64" "x86" "x86_64")
 set(ANDROID_STL_TYPE_LIST "c++_static" "gnustl_static" "c++_shared")
 
+set(ANDROID_NDK xxx/android-ndk-r22b)
 # Android ndk
 if(NOT DEFINED ANDROID_NDK)
     set(ANDROID_NDK $ENV{NDK_ROOT})

diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc
index 3cbc530eb..da86762e0 100644
--- a/src/google/protobuf/compiler/java/java_file.cc
+++ b/src/google/protobuf/compiler/java/java_file.cc
@@ -65,7 +65,7 @@ namespace java {
 namespace {
 
 struct FieldDescriptorCompare {
-  bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) {
+  bool operator ()(const FieldDescriptor* f1, const FieldDescriptor* f2) const{
     if(f1 == NULL) {
       return false;
     }

diff --git a/python/sota/emo.py b/python/sota/emo.py
index ebe3c9e..562a4d5 100644
--- a/python/sota/emo.py
+++ b/python/sota/emo.py
@@ -175,16 +175,7 @@ class iRMB(nn.Module):
         x = self.norm(x)
         B, C, H, W = x.shape
         if self.attn_s:
-            # padding
-            if self.window_size <= 0:
-                window_size_W, window_size_H = W, H
-            else:
-                window_size_W, window_size_H = self.window_size, self.window_size
-            pad_l, pad_t = 0, 0
-            pad_r = (window_size_W - W % window_size_W) % window_size_W
-            pad_b = (window_size_H - H % window_size_H) % window_size_H
-            x = F.pad(x, (pad_l, pad_r, pad_t, pad_b, 0, 0,))
-            n1, n2 = (H + pad_b) // window_size_H, (W + pad_r) // window_size_W
+            n1, n2 = H // self.window_size, W // self.window_size
             x = rearrange(x, 'b c (h1 n1) (w1 n2) -> (b n1 n2) c h1 w1', n1=n1, n2=n2).contiguous()
             # attention
             b, c, h, w = x.shape
@@ -206,8 +197,6 @@ class iRMB(nn.Module):
                 x_spa = rearrange(x_spa, 'b heads (h w) dim_head -> b (heads dim_head) h w', heads=self.num_head, h=h, w=w).contiguous()
             # unpadding
             x = rearrange(x_spa, '(b n1 n2) c h1 w1 -> b c (h1 n1) (w1 n2)', n1=n1, n2=n2).contiguous()
-            if pad_r > 0 or pad_b > 0:
-                x = x[:, :, :H, :W].contiguous()
         else:
             x = self.v(x)