diff --git a/device/rockchip/common/BoardConfig.mk b/device/rockchip/common/BoardConfig.mk
index 4771207725..90376ab228 100755
--- a/device/rockchip/common/BoardConfig.mk
+++ b/device/rockchip/common/BoardConfig.mk
@@ -226,7 +226,7 @@ BOARD_HAVE_FLASH ?= true
BOARD_SUPPORT_HDMI ?= true
# google apps
-BUILD_BOX_WITH_GOOGLE_MARKET ?= false
+BUILD_BOX_WITH_GOOGLE_MARKET ?= true
BUILD_WITH_GOOGLE_MARKET ?= false
BUILD_WITH_GOOGLE_MARKET_ALL ?= false
BUILD_WITH_GOOGLE_FRP ?= false
@@ -314,7 +314,7 @@ BOARD_DISABLE_SAFE_MODE ?= true
BOARD_ENABLE_3G_DONGLE := true
#for boot and shutdown animation ringing
-BOOT_SHUTDOWN_ANIMATION_RINGING ?= false
+BOOT_SHUTDOWN_ANIMATION_RINGING ?= true
#for boot video enable
BOOT_VIDEO_ENABLE ?= false
diff --git a/device/rockchip/common/bluetooth/bdroid_buildcfg.h b/device/rockchip/common/bluetooth/bdroid_buildcfg.h
index 5c15a70eb5..6513577a31 100644
--- a/device/rockchip/common/bluetooth/bdroid_buildcfg.h
+++ b/device/rockchip/common/bluetooth/bdroid_buildcfg.h
@@ -18,9 +18,7 @@
#define _BDROID_BUILDCFG_H
#define BTM_DEF_LOCAL_NAME "PROJECTOR"
-//#define BTA_DM_COD {0x1A, 0x01, 0x10}
-
-#define BLE_LOCAL_PRIVACY_ENABLED FALSE
+#define BTA_DM_COD {0x1A, 0x01, 0x10}
#endif
diff --git a/device/rockchip/rk312x/rk3128_box.mk b/device/rockchip/rk312x/rk3128_box.mk
index 20f4a8fa20..328e5f8ff3 100644
--- a/device/rockchip/rk312x/rk3128_box.mk
+++ b/device/rockchip/rk312x/rk3128_box.mk
@@ -47,5 +47,5 @@ PRODUCT_AAPT_CONFIG := normal tvdpi hdpi
PRODUCT_AAPT_PREF_CONFIG := tvdpi
PRODUCT_PROPERTY_OVERRIDES += \
- persist.sys.locale=zh-CN
+ persist.sys.locale=en-US
PRODUCT_MODEL := PROJECTOR
\ No newline at end of file
diff --git a/device/rockchip/rk312x/rk3128_box/preinstall_del/preinstall.mk b/device/rockchip/rk312x/rk3128_box/preinstall_del/preinstall.mk
index e69de29bb2..5e1f9f4379 100644
--- a/device/rockchip/rk312x/rk3128_box/preinstall_del/preinstall.mk
+++ b/device/rockchip/rk312x/rk3128_box/preinstall_del/preinstall.mk
@@ -0,0 +1,6 @@
+PRODUCT_PACKAGES += OfficeSuite
+PRODUCT_PACKAGES += happycast
+PRODUCT_PACKAGES += netflix
+PRODUCT_PACKAGES += YouTube
+PRODUCT_PACKAGES += AirPin_Pro_V4.4.3
+PRODUCT_PACKAGES += aptoidetv
diff --git a/device/rockchip/rk312x/rk3128_box/system.prop b/device/rockchip/rk312x/rk3128_box/system.prop
index a62bd7abe7..043f733244 100755
--- a/device/rockchip/rk312x/rk3128_box/system.prop
+++ b/device/rockchip/rk312x/rk3128_box/system.prop
@@ -30,7 +30,7 @@ sf.power.control=8847360
sys.rkadb.root=0
ro.sf.fakerotation=false
ro.sf.hwrotation=0
-ro.sys.overscan.main=100
+ro.sys.overscan.main=88
ro.rk.MassStorage=false
ro.rk.systembar.voiceicon=true
ro.rk.systembar.tabletUI=false
@@ -38,7 +38,7 @@ ro.rk.LowBatteryBrightness=true
ro.tether.denied=false
sys.resolution.changed=false
ro.default.size=100
-persist.sys.timezone=Asia/Shanghai
+persist.sys.timezone=Europe/London
persist.sys.ts.stop=false
ro.product.usbfactory=rockchip_usb
wifi.supplicant_scan_interval=15
diff --git a/frameworks/base/core/java/android/os/StatFs.java b/frameworks/base/core/java/android/os/StatFs.java
index 06634233e8..d249cdeae6 100755
--- a/frameworks/base/core/java/android/os/StatFs.java
+++ b/frameworks/base/core/java/android/os/StatFs.java
@@ -30,7 +30,7 @@ public class StatFs {
private boolean mFake;
private boolean isPri;
- private static final int TIMES = 8;
+ private static final int TIMES = 4;
private static final float Amltf = 1.48f; // 1.4f;
private static final float Amltf_1 = 1.40f; // 1.4f;
private static final double Amltd = 1.48; // 1.4;
diff --git a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 047e4a1131..0ebc98792e 100755
--- a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -234,5 +234,5 @@
<string name="config_default_input_method" translatable="false">com.sohu.inputmethod.sogouoem/.SogouIME</string>
<!-- for set Settings.System.TIME_12_24 default-->
- <string name="def_time_12_24" translatable="false">24</string>
+ <string name="def_time_12_24" translatable="false">12</string>
</resources>
diff --git a/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 04020fbddc..303fc1efab 100755
--- a/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2798,6 +2798,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
}
private String getDefaultDeviceName() {
- return mContext.getResources().getString(R.string.def_device_name_simple, Build.MODEL);
+ return mContext.getResources().getString(R.string.def_device_name_simple, "PROJECTOR");
}
}
diff --git a/hardware/rockchip/omx_il/include/rockchip/git_info.h b/hardware/rockchip/omx_il/include/rockchip/git_info.h
index a3c645e9d5..509a4cffc2 100644
--- a/hardware/rockchip/omx_il/include/rockchip/git_info.h
+++ b/hardware/rockchip/omx_il/include/rockchip/git_info.h
@@ -1 +1 @@
-#define OMX_COMPILE_INFO "author: xlm\n time: Fri, 16 Jun 2017 17:28:12 +0800 git commit 482d7c6ae7e6727f88866cddcb8f9de0860e475a "
+#define OMX_COMPILE_INFO "author: lsh\n time: Thu, 01 Sep 2022 14:57:29 +0800 git commit 10a389a35159f969f39acc9cd5cab0d17aefbd04 "
diff --git a/kernel/arch/arm/boot/dts/rk3128-box-rk88.dts b/kernel/arch/arm/boot/dts/rk3128-box-rk88.dts
index ea6a4e1a5e..0d2bbf9644 100755
--- a/kernel/arch/arm/boot/dts/rk3128-box-rk88.dts
+++ b/kernel/arch/arm/boot/dts/rk3128-box-rk88.dts
@@ -121,7 +121,7 @@
};
usb0: usb@10180000 {
/*0 - Normal, 1 - Force Host, 2 - Force Device*/
- rockchip,usb-mode = <2>;
+ rockchip,usb-mode = <1>;
};
rockchip_suspend: rockchip_suspend {
@@ -445,36 +445,41 @@
ir_key2{
rockchip,usercode = <0xfe01>;
rockchip,key_table =
- <0xff KEY_POWER>,
- <0xe7 KEY_POWER>,
- <0xfe KEY_MENU>,
- <0xe8 KEY_MENU>,
- <0xe5 251>,
- <0xf6 241>,
- <0xfa KEY_UP>,
- <0xb9 KEY_UP>,
- <0xfd KEY_LEFT>,
- <0xb8 KEY_LEFT>,
- <0xf9 KEY_HOME>,
- //<0xf9 KEY_REPLY>,
- <0xaa KEY_REPLY>,
- <0xf5 KEY_RIGHT>,
- <0xea KEY_RIGHT>,
- <0xfb KEY_DOWN>,
- <0xe9 KEY_DOWN>,
- <0xfc KEY_PLAYPAUSE>,
- <0xf4 KEY_BACK>,
- <0xbf KEY_BACK>,
- //<0xbf KEY_VOLUMEDOWN>,
- <0xeb KEY_VOLUMEDOWN>,
- <0xb7 KEY_VOLUMEUP>,
- <0xef KEY_VOLUMEUP>,
- <0xc3 KEY_F10>,
- <0xf7 KEY_MUTE>,//for yingda
- <0xbb KEY_MUTE>,
- <0x99 KEY_F11>;
-
+ <0xbf KEY_POWER>,
+ <0xbe KEY_MUTE>,
+
+ <0xef KEY_VOLUMEDOWN>,
+ <0xe7 KEY_VOLUMEUP>,
+
+ <0xee KEY_HOME>,
+ <0xe9 KEY_UP>,
+ <0xe6 KEY_BACK>,
+
+ <0xae KEY_LEFT>,
+ <0xec KEY_REPLY>,
+ <0xaf KEY_RIGHT>,
+
+ <0xb3 KEY_MENU>,
+ <0xe5 KEY_DOWN>,
+ <0xff 388>,
+
+ <0xb1 KEY_1>,
+ <0xf2 KEY_2>,
+ <0xf3 KEY_3>,
+
+ <0xb5 KEY_4>,
+ <0xf6 KEY_5>,
+ <0xf7 KEY_6>,
+
+ <0xb9 KEY_7>,
+ <0xfa KEY_8>,
+ <0xfb KEY_9>,
+
+ <0xfe KEY_0>,
+ <0xbd KEY_DELETE>,
+ <0xf0 250>,
+ <0xbc 251>;
};
ir_key3{
rockchip,usercode = <0x1dcc>;
diff --git a/kernel/drivers/video/rockchip/screen/rk_screen_init.c b/kernel/drivers/video/rockchip/screen/rk_screen_init.c
index a9d7c158db..4f0912a176 100755
--- a/kernel/drivers/video/rockchip/screen/rk_screen_init.c
+++ b/kernel/drivers/video/rockchip/screen/rk_screen_init.c
@@ -19,6 +19,39 @@
#include <linux/of_gpio.h>
#include <linux/device.h>
+ int int_data[27][45]=
+{
+ {0x07,0xF1,0x01,0x03,0xDF,0x91,0x68,0xF9},
+ {0x05,0xF1,0x01,0x01,0xDE,0x00},
+ //{0x05,0xF1,0x01,0x01,0xC2,0x35}, // 122
+ {0x06,0xF1,0x01,0x02,0xB2,0x00,0x60},
+ {0x06,0xF1,0x01,0x02,0xB3,0x00,0x4E},
+ {0x0a,0xF1,0x01,0x06,0xC1,0x00,0x14,0x40,0x80,0x00,0x00},
+ {0x0b,0xF1,0x01,0x07,0xBB,0x00,0x14,0x07,0x5C,0x14,0x44 ,0x44},
+ {0x06,0xF1,0x01,0x02,0xBE,0x1A,0xF2},
+ {0x18,0xF1,0x01,0x14,0xC3,0x10,0x74,0x73,0x74,0x73,0x05,0x05,0x00,0x00,0x15,0x15,0x31,0x85,0x17,0x05,0x6C,0x0A,0x10,0x0A,0x10},
+ {0x0b,0xF1,0x01,0x07,0xC4,0x13,0x2C,0x00,0x13,0x10,0x07,0x14},
+ {0x0d,0xF1,0x01,0x09,0xCF, 0x00,0x70,0x73,0x01,0x79,0x73,0x73,0x01,0x7C},
+ {0x1b,0xF1,0x01,0x17,0xD0, 0x00,0x1F,0x1F,0x1F,0x1F, 0x1F,0x1F,0x1F,0x1F,0x1F, 0x1F,0x03,0x01,0x0B,0x05,0x07,0x09,0x21,0x23,0x1F, 0x1F,0x1F,0x1F },
+ {0x1b,0xF1,0x01,0x17,0xD1, 0x00,0x1F,0x1F,0x1F,0x1F, 0x1F,0x1F,0x1F,0x1F,0x1F, 0x1F,0x02,0x00,0x0A,0x04,0x06,0x08,0x20,0x22,0x1F, 0x1F,0x1F,0x1F },
+ {0x1b,0xF1,0x01,0x17,0xD2, 0x00,0x1F,0x1F,0x1F,0x1F, 0x1F,0x1F,0x1F,0x1F,0x1F, 0x1F,0x20,0x22,0x04,0x0A, 0x08,0x06,0x02,0x00,0x1F,0x1F,0x1F,0x1F },
+ {0x1b,0xF1,0x01,0x17,0xD3, 0x00,0x1F,0x1F,0x1F,0x1F, 0x1F,0x1F,0x1F,0x1F,0x1F, 0x1F,0x21,0x23,0x05,0x0B, 0x09,0x07,0x03,0x01,0x1F, 0x1F,0x1F,0x1F },
+ {0x29,0xF1,0x01,0x25,0xD4, 0x30,0x00,0x00,0x09,0x00, 0x0B,0x00,0x00,0x00,0x00, 0x00,0x04,0x04,0x00,0x11,0x00,0x01,0xC0,0x04,0x01,0x01,0x00,0x84,0xBF,0xC4,0xC1,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+ {0x0c,0xF1,0x01,0x08,0xD5,0x68,0x74,0x00,0x05,0x10,0x00,0x03,0x00},
+ {0x0a,0xF1,0x01,0x06,0xB7, 0x10,0x07,0x08,0x10,0x07,0x08 },
+ {0x2a,0xF1,0x01,0x26,0xC8, 0x79,0x6B,0x61,0x5A,0x5A,0x4D,0x57,0x3E,0x57,0x56,0x55,0x73,0x65,0x6D,0x5F,0x56,0x4C,0x40,0x0F,0x79,0x6B,0x61,0x5A,0x5A,0x4D,0x57,0x3E,0x57,0x56,0x55,0x73,0x65,0x6D,0x5F,0x56,0x4C,0x40,0x0F},
+ {0x05,0xF1,0x01,0x01,0xDE,0x03 },
+ {0x05,0xF1,0x01,0x01,0xD5,0x20 },
+ {0x05,0xF1,0x01,0x01,0xDE,0x02 },
+ {0x06,0xF1,0x01,0x02,0xBB,0x00,0x41},
+ {0x05,0xF1,0x01,0x01,0xE7,0x01 },
+ {0x05,0xF1,0x01,0x01,0xDE,0x00 },
+ {0x05,0xF1,0x01,0x01,0x35,0x00 },
+ {0x04,0xF1,0x01,0x00,0x11 },
+ {0x04,0xF1,0x01,0x00,0x29 }
+};
+
+
struct screen_init_cmd {
u8 cmd;
u8 *value;
@@ -43,11 +76,12 @@ struct _spi_data {
struct _spi_data *spi_data;
+#if 0
static void spi_sentdata(unsigned char value, bool dcx)
{
- int i;
-
- if (spi_data->cmd_type == SCREEN_INIT_SPI_9BIT) {
+ //int i;
+ return ;
+ /*if (spi_data->cmd_type == SCREEN_INIT_SPI_9BIT) {
gpio_set_value(spi_data->spi_scl, 0);
gpio_set_value(spi_data->spi_sdi, dcx);
udelay(1);
@@ -65,39 +99,121 @@ static void spi_sentdata(unsigned char value, bool dcx)
udelay(1);
gpio_set_value(spi_data->spi_scl, 1);
value <<= 1;
+ }*/
+}
+#endif
+static void spi_sent9168(int value)
+{
+ int i=0;
+ gpio_set_value(spi_data->spi_scl, 0);
+ udelay(5);
+
+ for (i = 0; i < 8; i++) {
+
+ if (value & 0x80)
+ gpio_set_value(spi_data->spi_sdi, 1);
+ else
+ gpio_set_value(spi_data->spi_sdi, 0);
+ gpio_set_value(spi_data->spi_scl, 1);
+ udelay(5);
+ gpio_set_value(spi_data->spi_scl, 0);
+ udelay(5);
+ value <<= 1;
}
+
}
void spi_write_cmd(unsigned char c, u8 *d, u32 size)
{
- int i;
-
- gpio_set_value(spi_data->spi_cs, 0);
+ //int i;
+ return ;
+ /*gpio_set_value(spi_data->spi_cs, 0);
spi_sentdata(c, 0);
for (i = 0; i < size; i++)
spi_sentdata(*d++, 1);
- gpio_set_value(spi_data->spi_cs, 1);
+ gpio_set_value(spi_data->spi_cs, 1);*/
}
-static int spi_screen_init(void)
+static void spi_screen9163_init(void)
{
struct list_head *pos;
struct screen_init_cmd_list *init_cmd_list;
-
- gpio_direction_output(spi_data->spi_cs, 0);
+ u8 i=0,j=0,k=0,m=0;
+ int tmp[45];
gpio_direction_output(spi_data->spi_rst, 1);
- mdelay(2);
+ mdelay(20);
gpio_direction_output(spi_data->spi_rst, 0);
- mdelay(3);
- gpio_direction_output(spi_data->spi_rst, 1);
- mdelay(3);
+ mdelay(100);
gpio_direction_output(spi_data->spi_cs, 1);
- gpio_direction_output(spi_data->spi_sdi, 1);
- gpio_direction_output(spi_data->spi_scl, 1);
+ //gpio_direction_output(spi_data->spi_rst, 1);
+ //gpio_direction_output(spi_data->spi_rst, 0);
+ //mdelay(3);
+ //gpio_direction_output(spi_data->spi_rst, 1);
+ //mdelay(3);
+ //gpio_direction_output(spi_data->spi_cs, 1);
+ gpio_direction_output(spi_data->spi_sdi, 0);
+ gpio_direction_output(spi_data->spi_scl, 0);
mdelay(2);
+ //printk("andy spi_screen9163_init0\n");
+ list_for_each(pos, &spi_data->cmd_list_head) {
+ init_cmd_list =
+ list_entry(pos, struct screen_init_cmd_list, list);
+ spi_write_cmd(init_cmd_list->cmd.cmd, init_cmd_list->cmd.value,
+ init_cmd_list->cmd.value_size);
+ mdelay(init_cmd_list->cmd.delay);
+ }
+ for(m=0;m<3;m++)
+ {
+ for(i=0;i<27;i++)
+ {
+
+
+ for(j=0;j<int_data[i][0];j++)
+ tmp[j]=int_data[i][j+1];
+ j=int_data[i][0];
+ if(i==26)
+ mdelay(120);
+ gpio_set_value(spi_data->spi_sdi, 0);
+ gpio_set_value(spi_data->spi_scl, 0);
+ gpio_direction_output(spi_data->spi_cs, 0);
+ //printk("andy0=%d,andy1=%d,andy2=%d,andy3=%d,andy4=%d,andy5=%d,andy6=%d,andy6=%d\n",j,tmp[0],tmp[1],tmp[2],tmp[3],tmp[4],tmp[5],tmp[6]);
+
+ for(k=0;k<j;k++)
+ {
+ spi_sent9168(tmp[k]);
+ }
+ gpio_direction_output(spi_data->spi_cs, 1);
+ gpio_direction_output(spi_data->spi_sdi, 0);
+ gpio_direction_output(spi_data->spi_scl, 0);
+
+ }
+ }
+ mdelay(10);
+ gpio_direction_output(spi_data->spi_rst, 1);
+
+ //printk("andy spi_screen9163_init1\n");
+
+}
+static int spi_screen_init(void)
+{
+ struct list_head *pos;
+ struct screen_init_cmd_list *init_cmd_list;
+
+ gpio_direction_output(spi_data->spi_cs, 1);
+ //gpio_direction_output(spi_data->spi_rst, 1);
+ mdelay(2);
+ //gpio_direction_output(spi_data->spi_rst, 0);
+ //mdelay(3);
+ //gpio_direction_output(spi_data->spi_rst, 1);
+ //mdelay(3);
+ //gpio_direction_output(spi_data->spi_cs, 1);
+ gpio_direction_output(spi_data->spi_sdi, 0);
+ gpio_direction_output(spi_data->spi_scl, 0);
+ mdelay(2);
+ //printk("andy spi_screen_init0\n");
list_for_each(pos, &spi_data->cmd_list_head) {
init_cmd_list =
list_entry(pos, struct screen_init_cmd_list, list);
@@ -106,9 +222,10 @@ static int spi_screen_init(void)
mdelay(init_cmd_list->cmd.delay);
}
+ //printk("andy spi_screen_init1\n");
return 0;
}
-
+#if 0
static int rk_fb_parse_init_cmd(void)
{
struct device_node *childnode, *root;
@@ -208,52 +325,60 @@ err_free_mem:
return ret;
}
-
+#endif
static int rk_fb_parse_screen_init(struct device_node *np,
struct rk_screen *screen)
{
- u32 init_type = 0;
+// u32 init_type = 0;
struct device_node *root = NULL;
root = of_get_child_by_name(np, "screen_init");
+ //printk("andy rk_fb_parse_screen_init\n");
if (!root) {
pr_err("can't find screen_init node\n");
screen->init = NULL;
return -ENODEV;
}
-
- of_property_read_u32(root, "screen-init-type", &init_type);
+ //printk("andy rk_fb_parse_screen_init0\n");
+ /*of_property_read_u32(root, "screen-init-type", &init_type);
if ((init_type != SCREEN_INIT_SPI) &&
- (init_type != SCREEN_INIT_SPI_9BIT)) {
- pr_err("now unsupport screen init type: %d\n", init_type);
- return -1;
+ (init_type != SCREEN_INIT_SPI_9BIT)) {
+ pr_err("now unsupport screen init type: %d\n", init_type);
+ return -1;
}
-
- spi_data->cmd_type = init_type;
+printk("andy rk_fb_parse_screen_init1\n");
+ spi_data->cmd_type = init_type;*/
spi_data->spi_cs = of_get_named_gpio(root, "cs-gpio", 0);
if (gpio_request(spi_data->spi_cs, "cs_gpio") != 0) {
gpio_free(spi_data->spi_cs);
pr_err("spi_data spi_cs request failed\n");
}
+ gpio_direction_output(spi_data->spi_cs, 1);
+ //printk("andy rk_fb_parse_screen_init2\n");
spi_data->spi_sdi = of_get_named_gpio(root, "sdi-gpio", 0);
if (gpio_request(spi_data->spi_sdi, "sdi_gpio") != 0) {
gpio_free(spi_data->spi_sdi);
pr_err("spi_data spi_sdi request failed\n");
}
+ gpio_direction_output(spi_data->spi_sdi, 1);
+ //printk("andy rk_fb_parse_screen_init3\n");
spi_data->spi_scl = of_get_named_gpio(root, "scl-gpio", 0);
if (gpio_request(spi_data->spi_scl, "scl_gpio") != 0) {
gpio_free(spi_data->spi_scl);
pr_err("spi_data spi_scl request failed\n");
}
+ gpio_direction_output(spi_data->spi_scl, 1);
+ //printk("andy rk_fb_parse_screen_init4\n");
spi_data->spi_rst = of_get_named_gpio(root, "rst-gpio", 0);
if (gpio_request(spi_data->spi_rst, "rst_gpio") != 0) {
gpio_free(spi_data->spi_rst);
pr_err("spi_data spi_rst request failed\n");
}
-
- rk_fb_parse_init_cmd();
+ gpio_direction_output(spi_data->spi_rst, 1);
+ //printk("andy rk_fb_parse_screen_init5\n");
+ //rk_fb_parse_init_cmd();
return 0;
}
@@ -261,13 +386,14 @@ static int rk_fb_parse_screen_init(struct device_node *np,
int rk_fb_get_screen_init(struct device_node *np, struct rk_screen *screen)
{
int ret = 0;
-
+ //printk("andy rk_fb_get_screen_init\n");
if (unlikely(!screen))
return -1;
-
+ //printk("andy rk_fb_get_screen_init1\n");
spi_data = kzalloc(sizeof(*spi_data), GFP_KERNEL);
if (!spi_data)
return -ENOMEM;
+ // printk("andy rk_fb_get_screen_init2\n");
INIT_LIST_HEAD(&spi_data->cmd_list_head);
ret = rk_fb_parse_screen_init(np, screen);
@@ -276,8 +402,11 @@ int rk_fb_get_screen_init(struct device_node *np, struct rk_screen *screen)
kfree(spi_data);
return ret;
}
+ //printk("andy rk_fb_get_screen_init3\n");
screen->init = spi_screen_init;
spi_data->screen = screen;
+ spi_screen9163_init();
+ //printk("andy rk_fb_get_screen_init4\n");
return 0;
}
diff --git a/kernel/logo.bmp b/kernel/logo.bmp
index 363e908d86..4d2e736bdd 100644
Binary files a/kernel/logo.bmp and b/kernel/logo.bmp differ
diff --git a/kernel/logo_kernel.bmp b/kernel/logo_kernel.bmp
index 363e908d86..4d2e736bdd 100644
Binary files a/kernel/logo_kernel.bmp and b/kernel/logo_kernel.bmp differ
diff --git a/libcore/ojluni/src/main/java/java/io/UnixFileSystem.java b/libcore/ojluni/src/main/java/java/io/UnixFileSystem.java
index 4fa6b53118..6179868c1e 100755
--- a/libcore/ojluni/src/main/java/java/io/UnixFileSystem.java
+++ b/libcore/ojluni/src/main/java/java/io/UnixFileSystem.java
@@ -33,7 +33,7 @@ import sun.security.action.GetPropertyAction;
class UnixFileSystem extends FileSystem {
//VirtualSize = RealSize*128
- private static final int STORAGE_VIRTUAL_GAIN = 1;
+ private static final int STORAGE_VIRTUAL_GAIN = 4;
private final char slash;
private final char colon;
private final String javaHome;
diff --git a/oem/customers/.gitignore b/oem/customers/.gitignore
index 8b13789179..af4a0ac259 100644
--- a/oem/customers/.gitignore
+++ b/oem/customers/.gitignore
@@ -1 +1,2 @@
-
+/*
+!/null
diff --git a/oem/default_cn/logo.bmp b/oem/default_cn/logo.bmp
index 9796ad162d..4d2e736bdd 100755
Binary files a/oem/default_cn/logo.bmp and b/oem/default_cn/logo.bmp differ
diff --git a/oem/default_cn/pre_app/AISharjeck_V2.6.1.5a_supreme.apk b/oem/default_cn/pre_app/AISharjeck_V2.6.1.5a_supreme.apk
deleted file mode 100755
index 0637ec7521..0000000000
Binary files a/oem/default_cn/pre_app/AISharjeck_V2.6.1.5a_supreme.apk and /dev/null differ
diff --git a/oem/default_cn/pre_app/AISharjeck_V3.0.1.2a_supreme.apk b/oem/default_cn/pre_app/AISharjeck_V3.0.1.2a_supreme.apk
deleted file mode 100755
index 5625c59990..0000000000
Binary files a/oem/default_cn/pre_app/AISharjeck_V3.0.1.2a_supreme.apk and /dev/null differ
diff --git a/oem/default_cn/pre_app/ble_xj2100_pure_v3031.apk b/oem/default_cn/pre_app/ble_xj2100_pure_v3031.apk
deleted file mode 100755
index 078a372f2a..0000000000
Binary files a/oem/default_cn/pre_app/ble_xj2100_pure_v3031.apk and /dev/null differ
diff --git a/oem/product.xls b/oem/product.xls
index 79230c56b9..740c93b7cb 100755
Binary files a/oem/product.xls and b/oem/product.xls differ
diff --git a/packages/apps/BluetoothLeGatt_N/Android.mk b/packages/apps/BluetoothLeGatt_N/Android.mk
deleted file mode 100755
index 74fb18c3ec..0000000000
--- a/packages/apps/BluetoothLeGatt_N/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := BluetoothLeGatt2
-
-#LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/apps/TvSettings/Settings/res/values/strings.xml b/packages/apps/TvSettings/Settings/res/values/strings.xml
index 3038c33fed..89aa2384a5 100755
--- a/packages/apps/TvSettings/Settings/res/values/strings.xml
+++ b/packages/apps/TvSettings/Settings/res/values/strings.xml
@@ -1902,6 +1902,6 @@
<string name="about_mem_size">Memory size</string>
<string name="about_flash_size">Storage size</string>
- <string name="device_mem_default">2</string>
- <string name="device_flash_default">32</string>
+ <string name="device_mem_default">1</string>
+ <string name="device_flash_default">8</string>
</resources>
diff --git a/vendor/rockchip/common/apps/AIAssistant/Android.mk b/vendor/rockchip/common/apps/AIAssistant/Android.mk
deleted file mode 100755
index 4a1f795fba..0000000000
--- a/vendor/rockchip/common/apps/AIAssistant/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# HidAudio
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := AIAssistant
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=
-LOCAL_CERTIFICATE := platform
-ifeq ($(strip $(BOARD_XIAJIE_LANMEI)), true)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_lanmei.apk
-
-else ifeq ($(strip $(BOARD_XIAJIE_YINGDA)), true)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_yingda.apk
-
-else ifeq ($(strip $(BOARD_XIAJIE_AIBIYOU)), true)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_aiboyou.apk
-
-else ifeq ($(strip $(BOARD_XIAJIE_HENGYING)), true)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_hengying.apk
-
-else ifeq ($(strip $(BOARD_XIAJIE_HENGYING)), true)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_yunzhiwei.apk
-
-else
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-endif
-
-include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/AIManager/Android.mk b/vendor/rockchip/common/apps/AIManager/Android.mk
deleted file mode 100755
index 6475728519..0000000000
--- a/vendor/rockchip/common/apps/AIManager/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# HidAudio
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := AIManager
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/AshdLauncher/Android.mk b/vendor/rockchip/common/apps/AshdLauncher/Android.mk
deleted file mode 100755
index 871cf9c75a..0000000000
--- a/vendor/rockchip/common/apps/AshdLauncher/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# AshdLauncher
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := AshdLauncher
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=
-LOCAL_CERTIFICATE := platform
-#LOCAL_OVERRIDES_PACKAGES :=
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-#LOCAL_REQUIRED_MODULES :=
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_PREBUILT_JNI_LIBS := lib/libcrashsdk.so \
- lib/libumeng-spy.so
-include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/HidAudio/Android.mk b/vendor/rockchip/common/apps/HidAudio/Android.mk
deleted file mode 100755
index 092b8ce53d..0000000000
--- a/vendor/rockchip/common/apps/HidAudio/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# HidAudio
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := HidAudio
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_PRIVILEGED_MODULE :=true
-LOCAL_CERTIFICATE := platform
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/LightOS_home/Android.mk b/vendor/rockchip/common/apps/LightOS_home/Android.mk
deleted file mode 100755
index c4e12ae390..0000000000
--- a/vendor/rockchip/common/apps/LightOS_home/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# LightOS_home_v2.6.1_AiBoY_TY3128
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := LightOS_home
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=
-LOCAL_CERTIFICATE := PRESIGNED
-#LOCAL_OVERRIDES_PACKAGES :=
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-#LOCAL_REQUIRED_MODULES :=
-#LOCAL_PREBUILT_JNI_LIBS :=
-include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/LightOSappstore/Android.mk b/vendor/rockchip/common/apps/LightOSappstore/Android.mk
deleted file mode 100755
index 5a770fa260..0000000000
--- a/vendor/rockchip/common/apps/LightOSappstore/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# ChangeLedStatus
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := LightOSappstore
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=true
-LOCAL_CERTIFICATE := platform
-LOCAL_OVERRIDES_PACKAGES := Launcher3
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-#LOCAL_REQUIRED_MODULES :=
-#LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/RockFocus/Android.mk b/vendor/rockchip/common/apps/RockFocus/Android.mk
deleted file mode 100755
index 569dcab7cb..0000000000
--- a/vendor/rockchip/common/apps/RockFocus/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# Also link against our own custom library.
-# LOCAL_JAVA_LIBRARIES := framework
-
-LOCAL_PACKAGE_NAME := RockFocus
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
diff --git a/vendor/rockchip/common/apps/RockKeystonePortrait/Android.mk b/vendor/rockchip/common/apps/RockKeystonePortrait/Android.mk
deleted file mode 100755
index 6894f91a03..0000000000
--- a/vendor/rockchip/common/apps/RockKeystonePortrait/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# Also link against our own custom library.
-# LOCAL_JAVA_LIBRARIES := framework
-
-LOCAL_PACKAGE_NAME := RockKeystonePortrait
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
diff --git a/vendor/rockchip/common/apps/YuYin/Android.mk b/vendor/rockchip/common/apps/YuYin/Android.mk
deleted file mode 100755
index db11a64b5f..0000000000
--- a/vendor/rockchip/common/apps/YuYin/Android.mk
+++ /dev/null
@@ -1,185 +0,0 @@
-###############################################################################
-# Rklauncher0622
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := YuYin
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=
-LOCAL_CERTIFICATE := platform
-#LOCAL_OVERRIDES_PACKAGES :=
-
-ifeq ($(strip $(BOARD_YUYIN_JIN_JU)), true)
-$(warning a_bin=============>>> build jin ju apk)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_jinju.apk
-LOCAL_PREBUILT_JNI_LIBS := lib_jinju/libasc_dec.so \
- lib_jinju/libBugly.so \
- lib_jinju/libDataEncryption.so \
- lib_jinju/libddsdns.so \
- lib_jinju/libddsencryp.so \
- lib_jinju/libijkffmpeg.so \
- lib_jinju/libijkplayer.so \
- lib_jinju/libijksdl.so \
- lib_jinju/liblasa.so \
- lib_jinju/libnano.so \
- lib_jinju/libnanoApp.so \
- lib_jinju/libnanoApp_jni.so \
- lib_jinju/libopusogg.so \
- lib_jinju/librcnative.so \
- lib_jinju/libsbc.so \
- lib_jinju/libspeex.so \
- lib_jinju/libtvui_keyevent.so \
- lib_jinju/libvprint.so \
- lib_jinju/libwakeup.so
-else ifeq ($(strip $(BOARD_YUYIN_JIN_JU_NEW)), true)
-$(warning a_bin=============>>> build jin ju new apk)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_jinjunew.apk
-LOCAL_PREBUILT_JNI_LIBS := lib_jinjunew/libasc_dec.so \
- lib_jinjunew/libBugly.so \
- lib_jinjunew/libDataEncryption.so \
- lib_jinjunew/libddsdns.so \
- lib_jinjunew/libddsencryp.so \
- lib_jinjunew/libijkffmpeg.so \
- lib_jinjunew/libijkplayer.so \
- lib_jinjunew/libijksdl.so \
- lib_jinjunew/liblasa.so \
- lib_jinjunew/libnano.so \
- lib_jinjunew/libnanoApp.so \
- lib_jinjunew/libnanoApp_jni.so \
- lib_jinjunew/libopusogg.so \
- lib_jinjunew/librcnative.so \
- lib_jinjunew/libsbc.so \
- lib_jinjunew/libspeex.so \
- lib_jinjunew/libtvui_keyevent.so \
- lib_jinjunew/libvprint.so \
- lib_jinjunew/libwakeup.so
-else ifeq ($(strip $(BOARD_YUYIN_AO_DI)), true)
-$(warning a_bin=============>>> build ao di apk)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_aodi.apk
-LOCAL_PREBUILT_JNI_LIBS := lib_aodi/libasc_dec.so \
- lib_aodi/libBugly.so \
- lib_aodi/libddsdns.so \
- lib_aodi/libddsencryp.so \
- lib_aodi/libijkffmpeg.so \
- lib_aodi/libijkplayer.so \
- lib_aodi/libijksdl.so \
- lib_aodi/liblasa.so \
- lib_aodi/libnano.so \
- lib_aodi/libopusogg.so \
- lib_aodi/librcnative.so \
- lib_aodi/libsbc.so \
- lib_aodi/libspeex.so \
- lib_aodi/libtvui_keyevent.so \
- lib_aodi/libvprint.so \
- lib_aodi/libwakeup.so
-else ifeq ($(strip $(BOARD_YUYIN_FANG_TANG)), true)
-$(warning a_bin=============>>> build fangtang apk)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_fangtang.apk
-LOCAL_PREBUILT_JNI_LIBS := lib_fangtang/libasc_dec.so \
- lib_fangtang/libBugly.so \
- lib_fangtang/libddsdns.so \
- lib_fangtang/libddsencryp.so \
- lib_fangtang/libijkffmpeg.so \
- lib_fangtang/libijkplayer.so \
- lib_fangtang/libijksdl.so \
- lib_fangtang/liblasa.so \
- lib_fangtang/libnano.so \
- lib_fangtang/libopusogg.so \
- lib_fangtang/librcnative.so \
- lib_fangtang/libsbc.so \
- lib_fangtang/libspeex.so \
- lib_fangtang/libtvui_keyevent.so \
- lib_fangtang/libvprint.so \
- lib_fangtang/libwakeup.so
-else ifeq ($(strip $(BOARD_YUYIN_FANG_TANG_ZHONGQINGBAO)), true)
-$(warning a_bin=============>>> build fangtang zhongqing apk)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_fangtang_zhongqing.apk
-LOCAL_PREBUILT_JNI_LIBS := lib_fangtang_zhongqing/libasc_dec.so \
- lib_fangtang_zhongqing/libBugly.so \
- lib_fangtang_zhongqing/libDataEncryption.so \
- lib_fangtang_zhongqing/libddsdns.so \
- lib_fangtang_zhongqing/libddsencryp.so \
- lib_fangtang_zhongqing/libijkffmpeg.so \
- lib_fangtang_zhongqing/libijkplayer.so \
- lib_fangtang_zhongqing/libijksdl.so \
- lib_fangtang_zhongqing/liblasa.so \
- lib_fangtang_zhongqing/libnano.so \
- lib_fangtang_zhongqing/libnanoApp.so \
- lib_fangtang_zhongqing/libnanoApp_jni.so \
- lib_fangtang_zhongqing/libopusogg.so \
- lib_fangtang_zhongqing/librcnative.so \
- lib_fangtang_zhongqing/libsbc.so \
- lib_fangtang_zhongqing/libspeex.so \
- lib_fangtang_zhongqing/libtvui_keyevent.so \
- lib_fangtang_zhongqing/libvprint.so \
- lib_fangtang_zhongqing/libwakeup.so
-else ifeq ($(strip $(BOARD_YUYIN_FANG_TANG_YINGDA)), true)
-$(warning a_bin=============>>> build fangtang yingda apk)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_fangtang_yingda.apk
-LOCAL_PREBUILT_JNI_LIBS := lib_fangtang_yingda/libasc_dec.so \
- lib_fangtang_yingda/libBugly.so \
- lib_fangtang_yingda/libDataEncryption.so \
- lib_fangtang_yingda/libddsdns.so \
- lib_fangtang_yingda/libddsencryp.so \
- lib_fangtang_yingda/libijkffmpeg.so \
- lib_fangtang_yingda/libijkplayer.so \
- lib_fangtang_yingda/libijksdl.so \
- lib_fangtang_yingda/liblasa.so \
- lib_fangtang_yingda/libnano.so \
- lib_fangtang_yingda/libnanoApp.so \
- lib_fangtang_yingda/libnanoApp_jni.so \
- lib_fangtang_yingda/libopusogg.so \
- lib_fangtang_yingda/librcnative.so \
- lib_fangtang_yingda/libsbc.so \
- lib_fangtang_yingda/libspeex.so \
- lib_fangtang_yingda/libtvui_keyevent.so \
- lib_fangtang_yingda/libvprint.so \
- lib_fangtang_yingda/libwakeup.so
-
-else ifeq ($(strip $(BOARD_YUYIN_YI_TIAN)), true)
-$(warning a_bin=============>>> build yitian apk)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_yitian.apk
-LOCAL_PREBUILT_JNI_LIBS := lib_yitian/libasc_dec.so \
- lib_yitian/libBugly.so \
- lib_yitian/libddsdns.so \
- lib_yitian/libddsencryp.so \
- lib_yitian/libijkffmpeg.so \
- lib_yitian/libijkplayer.so \
- lib_yitian/libijksdl.so \
- lib_yitian/liblasa.so \
- lib_yitian/libnano.so \
- lib_yitian/libopusogg.so \
- lib_yitian/librcnative.so \
- lib_yitian/libsbc.so \
- lib_yitian/libspeex.so \
- lib_yitian/libtvui_keyevent.so \
- lib_yitian/libvprint.so \
- lib_yitian/libwakeup.so
-else
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-#LOCAL_REQUIRED_MODULES :=
-LOCAL_PREBUILT_JNI_LIBS := lib/libasc_dec.so \
- lib/libBugly.so \
- lib/libDataEncryption.so \
- lib/libddsdns.so \
- lib/libddsencryp.so \
- lib/libijkffmpeg.so \
- lib/libijkplayer.so \
- lib/libijksdl.so \
- lib/liblasa.so \
- lib/libnano.so \
- lib/libnanoApp.so \
- lib/libnanoApp_jni.so \
- lib/libopusogg.so \
- lib/librcnative.so \
- lib/libsbc.so \
- lib/libspeex.so \
- lib/libtvui_keyevent.so \
- lib/libvprint.so \
- lib/libwakeup.so
-
-endif
-
-include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/speechclient/Android.mk b/vendor/rockchip/common/apps/speechclient/Android.mk
deleted file mode 100755
index 28574380c7..0000000000
--- a/vendor/rockchip/common/apps/speechclient/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# ChangeLedStatus
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := speechclient
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=true
-LOCAL_CERTIFICATE := platform
-LOCAL_OVERRIDES_PACKAGES := Launcher3
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-#LOCAL_REQUIRED_MODULES :=
-#LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/vesuviusOTA/Android.mk b/vendor/rockchip/common/apps/vesuviusOTA/Android.mk
deleted file mode 100755
index c93b02ead1..0000000000
--- a/vendor/rockchip/common/apps/vesuviusOTA/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# ChangeLedStatus
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := vesuviusOTA
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=true
-LOCAL_CERTIFICATE := platform
-LOCAL_OVERRIDES_PACKAGES := Launcher3
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-#LOCAL_REQUIRED_MODULES :=
-#LOCAL_MULTILIB := 32
-include $(BUILD_PREBUILT)