From ce70f366512da4f2dda4b612e695f59f1c336817 Mon Sep 17 00:00:00 2001 From: lishihao Date: Fri, 27 May 2022 17:00:19 +0800 Subject: [PATCH] XComponent Arm64 Signed-off-by: lishihao --- ETSUI/XComponent/README_zh.md | 4 +++- ETSUI/XComponent/build-profile.json5 | 4 ++-- ETSUI/XComponent/entry/build-profile.json5 | 2 +- ETSUI/XComponent/entry/src/main/config.json | 3 +-- .../entry/src/main/cpp/common/plugin_common.h | 11 ++++++----- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ETSUI/XComponent/README_zh.md b/ETSUI/XComponent/README_zh.md index f8988bcd09..f25f02b36d 100644 --- a/ETSUI/XComponent/README_zh.md +++ b/ETSUI/XComponent/README_zh.md @@ -18,4 +18,6 @@ 1.本示例仅支持在标准系统上运行。 -2.本示例需要使用3.0.0.900及以上的DevEco Studio版本才可编译运行。 \ No newline at end of file +2.本示例需要使用3.0.0.900及以上的DevEco Studio版本才可编译运行。 + +3.API8只支持32位，API9支持32位和64位；当前Demo应用使用API9，支持32位和64位版本。 \ No newline at end of file diff --git a/ETSUI/XComponent/build-profile.json5 b/ETSUI/XComponent/build-profile.json5 index 3854f71fc4..d7b1117cdb 100644 --- a/ETSUI/XComponent/build-profile.json5 +++ b/ETSUI/XComponent/build-profile.json5 @@ -1,8 +1,8 @@ { "app": { "signingConfigs": [], - "compileSdkVersion": 8, - "compatibleSdkVersion": 8, + "compileSdkVersion": 9, + "compatibleSdkVersion": 9, "products": [ { "name": "default", diff --git a/ETSUI/XComponent/entry/build-profile.json5 b/ETSUI/XComponent/entry/build-profile.json5 index ab47596553..a191db23a0 100644 --- a/ETSUI/XComponent/entry/build-profile.json5 +++ b/ETSUI/XComponent/entry/build-profile.json5 @@ -5,7 +5,7 @@ "path": "./src/main/cpp/CMakeLists.txt", "arguments": "-v -DOHOS_STL=c++_shared", "abiFilters": [ - "armeabi-v7a", + "armeabi-v7a", "arm64-v8a" ], "cppFlags": "", } diff --git a/ETSUI/XComponent/entry/src/main/config.json b/ETSUI/XComponent/entry/src/main/config.json index fc31bfb854..3bf089d0cd 100644 --- a/ETSUI/XComponent/entry/src/main/config.json +++ b/ETSUI/XComponent/entry/src/main/config.json @@ -11,8 +11,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", - "tablet" + "default" ], "abilities": [ { diff --git a/ETSUI/XComponent/entry/src/main/cpp/common/plugin_common.h b/ETSUI/XComponent/entry/src/main/cpp/common/plugin_common.h index a6006743e8..31e3d34e8a 100644 --- a/ETSUI/XComponent/entry/src/main/cpp/common/plugin_common.h +++ b/ETSUI/XComponent/entry/src/main/cpp/common/plugin_common.h @@ -17,10 +17,11 @@ #define _PLUGIN_COMMON_H_ #include - -#define LOGI(...) ((void)OH_LOG_Print(LOG_APP, LOG_INFO, LOG_DOMAIN, "HMG_LOG", __VA_ARGS__)) -#define LOGD(...) ((void)OH_LOG_Print(LOG_APP, LOG_DEBUG, LOG_DOMAIN, "HMG_LOG", __VA_ARGS__)) -#define LOGW(...) ((void)OH_LOG_Print(LOG_APP, LOG_WARN, LOG_DOMAIN, "HMG_LOG", __VA_ARGS__)) -#define LOGE(...) ((void)OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_DOMAIN, "HMG_LOG", __VA_ARGS__)) +#define APP_LOG_DOMAIN 0x0001 +#define APP_LOG_TAG "XComponent_Native" +#define LOGI(...) ((void)OH_LOG_Print(LOG_APP, LOG_INFO, APP_LOG_DOMAIN, APP_LOG_TAG, __VA_ARGS__)) +#define LOGD(...) ((void)OH_LOG_Print(LOG_APP, LOG_DEBUG, APP_LOG_DOMAIN, APP_LOG_TAG, __VA_ARGS__)) +#define LOGW(...) ((void)OH_LOG_Print(LOG_APP, LOG_WARN, APP_LOG_DOMAIN, APP_LOG_TAG, __VA_ARGS__)) +#define LOGE(...) ((void)OH_LOG_Print(LOG_APP, LOG_ERROR, APP_LOG_DOMAIN, APP_LOG_TAG, __VA_ARGS__)) #endif // _PLUGIN_COMMON_H_ \ No newline at end of file -- Gitee