From 9df2c4fb56fc55be10cd2b9c46edd0bea6c441e1 Mon Sep 17 00:00:00 2001 From: yaofangyong <14130401+sanbaoyao@user.noreply.gitee.com> Date: Mon, 13 May 2024 11:34:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=82=E9=85=8Dx86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index 79fdb01..ab2eff3 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,8 +4,10 @@ { "name": "default", "signingConfig": "default", - "compileSdkVersion": 12, - "compatibleSdkVersion": 12 + "compatibleSdkVersion": "5.0.0(12)", + "compileSdkVersion": "5.0.0(12)", + "targetSdkVersion": "5.0.0(12)", + "runtimeOS": "HarmonyOS" } ], "buildModeSet": [ From 090c081345e02b3d99a41f29bdde6793d63ca2b8 Mon Sep 17 00:00:00 2001 From: yaofangyong <14130401+sanbaoyao@user.noreply.gitee.com> Date: Mon, 13 May 2024 18:35:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=82=E9=85=8Dx86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gpu_transform/build-profile.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu_transform/build-profile.json5 b/gpu_transform/build-profile.json5 index f4b0a30..7334e7b 100644 --- a/gpu_transform/build-profile.json5 +++ b/gpu_transform/build-profile.json5 @@ -5,7 +5,7 @@ "path": "./src/main/cpp/CMakeLists.txt", "arguments": " -DCMAKE_BUILD_TYPE=Release", "abiFilters": [ - "armeabi-v7a", +// "armeabi-v7a", "arm64-v8a", "x86_64" ], From ebe443ca183ef3e5df57f15c81b27d8730034be9 Mon Sep 17 00:00:00 2001 From: yaofangyong <14130401+sanbaoyao@user.noreply.gitee.com> Date: Fri, 17 May 2024 17:16:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dxts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/module.json5 | 3 +-- entry/src/ohosTest/module.json5 | 2 +- gpu_transform/src/main/module.json5 | 3 +-- library/src/main/module.json5 | 3 +-- sharedlibrary/src/main/module.json5 | 3 +-- sharedlibrary2/src/main/module.json5 | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index d5bfffb..5ab0042 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/entry/src/ohosTest/module.json5 b/entry/src/ohosTest/module.json5 index 3054622..71f4334 100644 --- a/entry/src/ohosTest/module.json5 +++ b/entry/src/ohosTest/module.json5 @@ -5,7 +5,7 @@ "srcEntry": "./ets/testability/TestAbility.ets", "description": "$string:module_test_desc", "mainElement": "TestAbility", - "deviceTypes": ["default"], + "deviceTypes": ["default", "tablet", "phone", "tv", "wearable", "car", "2in1"], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:test_pages", diff --git a/gpu_transform/src/main/module.json5 b/gpu_transform/src/main/module.json5 index ad730e4..7e62ac0 100644 --- a/gpu_transform/src/main/module.json5 +++ b/gpu_transform/src/main/module.json5 @@ -3,8 +3,7 @@ "name": "gpu_transform", "type": "har", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ] } } diff --git a/library/src/main/module.json5 b/library/src/main/module.json5 index 7274415..a33206a 100644 --- a/library/src/main/module.json5 +++ b/library/src/main/module.json5 @@ -3,8 +3,7 @@ "name": "library", "type": "har", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ], "uiSyntax": "ets" } diff --git a/sharedlibrary/src/main/module.json5 b/sharedlibrary/src/main/module.json5 index 7e37699..72a3fae 100644 --- a/sharedlibrary/src/main/module.json5 +++ b/sharedlibrary/src/main/module.json5 @@ -4,8 +4,7 @@ "type": "shared", "description": "$string:shared_desc", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ], "deliveryWithInstall": true, "pages": "$profile:main_pages" diff --git a/sharedlibrary2/src/main/module.json5 b/sharedlibrary2/src/main/module.json5 index ff37b1a..b84b1fc 100644 --- a/sharedlibrary2/src/main/module.json5 +++ b/sharedlibrary2/src/main/module.json5 @@ -4,8 +4,7 @@ "type": "shared", "description": "$string:shared_desc", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ], "deliveryWithInstall": true, "pages": "$profile:main_pages" From f56f56dc9fa39d7214630d138bbd99748bb16bad Mon Sep 17 00:00:00 2001 From: yaofangyong <14130401+sanbaoyao@user.noreply.gitee.com> Date: Fri, 17 May 2024 17:16:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dxts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaofangyong <14130401+sanbaoyao@user.noreply.gitee.com> signoff --- entry/src/main/module.json5 | 3 +-- entry/src/ohosTest/module.json5 | 2 +- gpu_transform/src/main/module.json5 | 3 +-- library/src/main/module.json5 | 3 +-- sharedlibrary/src/main/module.json5 | 3 +-- sharedlibrary2/src/main/module.json5 | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index d5bfffb..5ab0042 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/entry/src/ohosTest/module.json5 b/entry/src/ohosTest/module.json5 index 3054622..71f4334 100644 --- a/entry/src/ohosTest/module.json5 +++ b/entry/src/ohosTest/module.json5 @@ -5,7 +5,7 @@ "srcEntry": "./ets/testability/TestAbility.ets", "description": "$string:module_test_desc", "mainElement": "TestAbility", - "deviceTypes": ["default"], + "deviceTypes": ["default", "tablet", "phone", "tv", "wearable", "car", "2in1"], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:test_pages", diff --git a/gpu_transform/src/main/module.json5 b/gpu_transform/src/main/module.json5 index ad730e4..7e62ac0 100644 --- a/gpu_transform/src/main/module.json5 +++ b/gpu_transform/src/main/module.json5 @@ -3,8 +3,7 @@ "name": "gpu_transform", "type": "har", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ] } } diff --git a/library/src/main/module.json5 b/library/src/main/module.json5 index 7274415..a33206a 100644 --- a/library/src/main/module.json5 +++ b/library/src/main/module.json5 @@ -3,8 +3,7 @@ "name": "library", "type": "har", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ], "uiSyntax": "ets" } diff --git a/sharedlibrary/src/main/module.json5 b/sharedlibrary/src/main/module.json5 index 7e37699..72a3fae 100644 --- a/sharedlibrary/src/main/module.json5 +++ b/sharedlibrary/src/main/module.json5 @@ -4,8 +4,7 @@ "type": "shared", "description": "$string:shared_desc", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ], "deliveryWithInstall": true, "pages": "$profile:main_pages" diff --git a/sharedlibrary2/src/main/module.json5 b/sharedlibrary2/src/main/module.json5 index ff37b1a..b84b1fc 100644 --- a/sharedlibrary2/src/main/module.json5 +++ b/sharedlibrary2/src/main/module.json5 @@ -4,8 +4,7 @@ "type": "shared", "description": "$string:shared_desc", "deviceTypes": [ - "default", - "tablet" + "default", "tablet", "phone", "tv", "wearable", "car", "2in1" ], "deliveryWithInstall": true, "pages": "$profile:main_pages"