Merge branch 'master' of gitee.com:openharmony/startup_appspawn into master

BUILD.gn

@@ -24,10 +24,6 @@ config("appspawn_config") {
     "//utils/native/base/include",
     "util/include",
     "${aafwk_path}/interfaces/kits/native/appkit/app",
-    "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr",
-    "${aafwk_path}/interfaces/innerkits/ability_manager/include",
-    "${aafwk_path}/interfaces/kits/native/ability/native",
-    "${aafwk_path}/services/abilitymgr/include",
     "//base/global/resource_management/interfaces/inner_api/include",
     "//base/security/access_token/interfaces/innerkits/token_setproc/include",
     "//base/startup/init_lite/services/log",

adapter/appspawn_adapter.cpp

@@ -17,10 +17,10 @@
 
 #include <cerrno>
 
-#include "token_setproc.h"
 #ifdef WITH_SELINUX
 #include "hap_restorecon.h"
 #endif
+#include "token_setproc.h"
 
 void SetAppAccessToken(struct AppSpawnContent_ *content, AppSpawnClient *client)
 {

adapter/appspawn_log.cpp

@@ -15,15 +15,18 @@
  
 #include "appspawn_server.h"
 
-#include <cerrno>
-#include <ctime>
-#include <cstdarg>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
+#include <sys/stat.h>
+
+#include <cerrno>
+#include <cstdarg>
+#include <ctime>
+
 #include "hilog/log.h"
 #include "securec.h"
+
 namespace {
     AppspawnLogLevel g_logLevel = AppspawnLogLevel::INFO;
     constexpr int MAX_LOG_SIZE = 1024;

adapter/appspawn_nweb.cpp

@@ -13,14 +13,15 @@
  * limitations under the License.
  */
 
-#include "appspawn_adapter.h"
+#include <dlfcn.h>
 
 #include <algorithm>
 #include <ctime>
-#include <dlfcn.h>
 #include <map>
 #include <string>
 
+#include "appspawn_adapter.h"
+
 struct RenderProcessNode {
     RenderProcessNode(time_t now, int exit):recordTime_(now), exitStatus_(exit) {}
     time_t recordTime_;

adapter/appspawn_sandbox.cpp

@@ -15,13 +15,14 @@
 
 #include "appspawn_adapter.h"
 
-#include <string>
 #include <unistd.h>
+
+#include <string>
 #include <vector>
 
+#include "hilog/log.h"
 #include "json_utils.h"
 #include "sandbox_utils.h"
-#include "hilog/log.h"
 
 using namespace std;
 using namespace OHOS;

interfaces/innerkits/client/appspawn_socket.cpp

@@ -15,9 +15,10 @@
 
 #include "appspawn_socket.h"
 
+#include <sys/socket.h>
+
 #include <cerrno>
 #include <iostream>
-#include <sys/socket.h>
 
 #include "hilog/log.h"
 #include "pubdef.h"

interfaces/innerkits/client/client_socket.cpp

@@ -15,9 +15,10 @@
 
 #include "client_socket.h"
 
+#include <sys/socket.h>
+
 #include <cerrno>
 #include <iostream>
-#include <sys/socket.h>
 
 #include "hilog/log.h"
 #include "securec.h"

test/moduletest/BUILD.gn

@@ -38,7 +38,7 @@ ohos_moduletest("AppSpawnModuleTest") {
   ]
 
   external_deps = [
-    "ability_runtime:app_manager",
+    "bundle_framework:appexecfwk_base",
     "hiviewdfx_hilog_native:libhilog",
   ]
 }

test/moduletest/appspawn_module_test.cpp

@@ -15,13 +15,13 @@
 
 #include <fcntl.h>
 #include <unistd.h>
+
 #include <cstdio>
 
 #include "gtest/gtest.h"
-#include "securec.h"
-
 #include "app_spawn_client.h"
 #include "hilog/log.h"
+#include "securec.h"
 
 using namespace testing::ext;
 using namespace OHOS;

test/unittest/app_spawn_lite_test/app_spawn_lite_test.cpp

@@ -12,17 +12,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <sys/types.h>
+
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <sys/types.h>
 #include <ctime>
 #include <vector>
+
 #include "gtest/gtest.h"
 #include "appspawn_message.h"
-#include "appspawn_service.h"
 #include "appspawn_msg.h"
+#include "appspawn_service.h"
 
 using namespace testing::ext;
 
@@ -390,4 +393,4 @@ HWTEST_F(AppSpawnLiteTest, SetContentFunctionTest_001, TestSize.Level0)
     free(liteClient);
     GTEST_LOG_(INFO) << "SetContentFunctionTest_001 end";
 }
-}  // namespace OHOS
+}  // namespace OHOS

test/unittest/app_spawn_socket_test/app_spawn_socket_test.cpp

@@ -14,8 +14,9 @@
  */
 
 #include <gtest/gtest.h>
-#include <cstring>
+
 #include <cerrno>
+#include <cstring>
 
 // redefine private and protected since testcase need to invoke and test private function
 #define private public

test/unittest/app_spawn_standard_test/app_spawn_standard_test.cpp

@@ -12,10 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <memory>
+
 #include <gtest/gtest.h>
+
 #include <cstring>
 #include <cerrno>
+#include <memory>
 
 // redefine private and protected since testcase need to invoke and test private function
 #define private public
@@ -24,9 +26,9 @@
 #undef private
 #undef protected
 
-#include "securec.h"
 #include "appspawn_adapter.h"
 #include "appspawn_server.h"
+#include "securec.h"
 
 using namespace testing;
 using namespace testing::ext;

test/unittest/client_socket_test/client_socket_test.cpp

@@ -13,9 +13,10 @@
  * limitations under the License.
  */
 
-#include <memory>
 #include <gtest/gtest.h>
 
+#include <memory>
+
 // redefine private and protected since testcase need to invoke and test private function
 #define private public
 #define protected public

util/src/sandbox_utils.cpp

@@ -14,23 +14,26 @@
  */
 
 #include "sandbox_utils.h"
-#include "json_utils.h"
-#include "hilog/log.h"
-#include "securec.h"
 
+#include <dirent.h>
+#include <dlfcn.h>
+#include <fcntl.h>
 #include <unistd.h>
-#include <sys/wait.h>
+
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
-#include <fcntl.h>
+#include <sys/wait.h>
+
 #include <cerrno>
-#include <dirent.h>
-#include <dlfcn.h>
 #include <fstream>
 #include <sstream>
 
+#include "hilog/log.h"
+#include "json_utils.h"
+#include "securec.h"
+
 using namespace std;
 using namespace OHOS;
 using namespace OHOS::HiviewDFX;