From: notaz <notasas@gmail.com>
Date: Sun, 10 Jun 2012 13:30:49 +0000 (+0300)
Subject: rename included apps so that market doesn't try upgrade them
X-Git-Tag: r5~8
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4482def439bc61b033923fa9f9ef1c2e96a89a;p=android_pandora.git

rename included apps so that market doesn't try upgrade them
---

diff --git a/init.rc b/init.rc
index 1351714..be3190b 100644
--- a/init.rc
+++ b/init.rc
@@ -22,6 +22,9 @@ loglevel 3
 # Location of BT firmware files
     export BT_FW_PATH /vendor/firmware
 
+# for windows adb users..
+    export LS_COLORS none
+
 # Backward compatibility
     symlink /system/etc /etc
     symlink /sys/kernel/debug /d
diff --git a/pandora.mk b/pandora.mk
index 500f1cd..b2eb06a 100644
--- a/pandora.mk
+++ b/pandora.mk
@@ -6,7 +6,7 @@ PRODUCT_PACKAGES := \
 	alsa.$(TARGET_PRODUCT) \
 	kill_android \
 	AndroidTerm \
-	libjackpal-androidterm3 \
+	libjackpal-androidterm3-pnd \
 	oi-filemanager \
 
 $(call inherit-product, build/target/product/generic.mk)
diff --git a/patches/external_custom.patch b/patches/external_custom.patch
index 87df369..83db36e 100644
--- a/patches/external_custom.patch
+++ b/patches/external_custom.patch
@@ -1,9 +1,31 @@
 
 project external_custom/android-terminal-emulator/
+diff --git a/external_custom/android-terminal-emulator/Android.mk b/external_custom/android-terminal-emulator/Android.mk
+index 6f95cb4..a9ece36 100644
+--- a/external_custom/android-terminal-emulator/Android.mk
++++ b/external_custom/android-terminal-emulator/Android.mk
+@@ -30,7 +30,7 @@ LOCAL_PACKAGE_NAME := AndroidTerm
+ 
+ LOCAL_MODULE_TAGS := optional
+ 
+-LOCAL_JNI_SHARED_LIBRARIES := libjackpal-androidterm3
++LOCAL_JNI_SHARED_LIBRARIES := libjackpal-androidterm3-pnd
+ 
+ include $(BUILD_PACKAGE)
+ 
 diff --git a/external_custom/android-terminal-emulator/jni/Android.mk b/external_custom/android-terminal-emulator/jni/Android.mk
-index da25a8f..bfbd384 100644
+index da25a8f..eaa764c 100644
 --- a/external_custom/android-terminal-emulator/jni/Android.mk
 +++ b/external_custom/android-terminal-emulator/jni/Android.mk
+@@ -21,7 +21,7 @@ LOCAL_PATH:= $(call my-dir)
+ include $(CLEAR_VARS)
+ 
+ # This is the target being built.
+-LOCAL_MODULE:= libjackpal-androidterm3
++LOCAL_MODULE:= libjackpal-androidterm3-pnd
+ 
+ # All of the source files that we will compile.
+ LOCAL_SRC_FILES:= \
 @@ -29,4 +29,8 @@ LOCAL_SRC_FILES:= \
  
  LOCAL_LDLIBS := -ldl -llog
@@ -13,3 +35,16 @@ index da25a8f..bfbd384 100644
 +LOCAL_MODULE_TAGS := optional
 +
  include $(BUILD_SHARED_LIBRARY)
+diff --git a/external_custom/android-terminal-emulator/src/jackpal/androidterm/Exec.java b/external_custom/android-terminal-emulator/src/jackpal/androidterm/Exec.java
+index b2f342f..9bad15f 100644
+--- a/external_custom/android-terminal-emulator/src/jackpal/androidterm/Exec.java
++++ b/external_custom/android-terminal-emulator/src/jackpal/androidterm/Exec.java
+@@ -30,7 +30,7 @@ import java.io.FileDescriptor;
+ public class Exec
+ {
+     static {
+-        System.loadLibrary("jackpal-androidterm3");
++        System.loadLibrary("jackpal-androidterm3-pnd");
+     }
+ 
+     /**