Skip to content

Commit 654326e

Browse files
committed
Fix live2d-tests
1 parent 5f099c5 commit 654326e

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

tests/live2d-tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ endif()
6666
if(ANDROID)
6767
# the APP_NAME should match on AndroidManifest.xml
6868
list(APPEND GAME_SOURCE
69-
proj.android/app/jni/hellocpp/main.cpp
69+
proj.android/app/jni/main.cpp
7070
)
7171
elseif(LINUX)
7272
list(APPEND GAME_SOURCE

tests/live2d-tests/proj.android/app/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.cocos2dx.hellocpp"
3+
package="org.cocos2dx.live2d_tests"
44
android:installLocation="auto">
55

66
<uses-permission android:name="android.permission.INTERNET"/>
@@ -14,7 +14,7 @@
1414

1515
<!-- Tell Cocos2dxActivity the name of our .so -->
1616
<meta-data android:name="android.app.lib_name"
17-
android:value="HelloCpp" />
17+
android:value="live2d_tests" />
1818

1919
<activity
2020
android:name="org.cocos2dx.cpp.AppActivity"

tests/live2d-tests/proj.android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
def cmakeVer = axistools.findCMake(project)
2020

2121
defaultConfig {
22-
applicationId "org.cocos2dx.hellocpp"
22+
applicationId "org.cocos2dx.live2d_tests"
2323
minSdkVersion PROP_MIN_SDK_VERSION
2424
targetSdkVersion PROP_TARGET_SDK_VERSION
2525
versionCode 1

tests/live2d-tests/proj.android/app/jni/hellocpp/main.cpp renamed to tests/live2d-tests/proj.android/app/jni/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/****************************************************************************
22
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
3+
Copyright (c) 2022 Bytedance Inc.
34
4-
http://www.cocos2d-x.org
5+
https://axis-project.github.io/
56
67
Permission is hereby granted, free of charge, to any person obtaining a copy
78
of this software and associated documentation files (the "Software"), to deal
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">HelloCpp</string>
2+
<string name="app_name">Live2dTests</string>
33
</resources>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import java.nio.file.Paths
22
include ':libcocos2dx'
33
project(':libcocos2dx').projectDir = new File(Paths.get("${System.env.AXIS_ROOT}/core/platform/android/libcocos2dx").toUri())
4-
include ':HelloCpp'
5-
project(':HelloCpp').projectDir = new File(settingsDir, 'app')
6-
rootProject.name = "HelloCpp"
4+
include ':Live2dTests'
5+
project(':Live2dTests').projectDir = new File(settingsDir, 'app')
6+
rootProject.name = "live2d-tests"

0 commit comments

Comments
 (0)