aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-05-25 09:21:23 +0800
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-05-25 09:40:19 +0800
commitbfaca7514c709e818aa9f7eaa7ebb590e5166733 (patch)
treef993a6339711f1a6e6ed523b3b231cfccec94036
parent11fdeef6122c86f21f7fab72fa8cdb99ef5d68b5 (diff)
rm lastmode
Change-Id: Ide060be2a78d25c8ce74decc57e2f6ef5f89a67e
-rw-r--r--conf/hs-conf.json9
-rw-r--r--conf/lastmode.json6
-rw-r--r--src/CMakeLists.txt3
3 files changed, 1 insertions, 17 deletions
diff --git a/conf/hs-conf.json b/conf/hs-conf.json
index 0c01ebd..aa0a1ec 100644
--- a/conf/hs-conf.json
+++ b/conf/hs-conf.json
@@ -24,17 +24,8 @@
}
],
"default-lastmode": [
- {
- "appid": "launcher",
- "visibility": "visible",
- "after": "homescreen"
- }
],
"normal-apps": [
- {
- "appid": "warehouse",
- "visibility": "invisible"
- }
]
}
} \ No newline at end of file
diff --git a/conf/lastmode.json b/conf/lastmode.json
deleted file mode 100644
index 68ea81f..0000000
--- a/conf/lastmode.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
- "appid": "phone",
- "visibility": "visible"
- }
-] \ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6baa3b3..21cbf49 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,8 +67,7 @@ add_custom_command(TARGET ${TARGETS_HSBINDER} POST_BUILD
COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_HSBINDER}.so ${PROJECT_BINARY_DIR}/package/root/lib
COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
- COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/hs-conf.json ${PROJECT_BINARY_DIR}/package/root/etc
- COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/lastmode.json ${PROJECT_BINARY_DIR}/package/root/etc
+ COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/*.json ${PROJECT_BINARY_DIR}/package/root/etc
)
add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root