From: snicker Date: Wed, 29 Nov 2023 12:29:36 +0000 (+0800) Subject: fix compile error in linux , remove some .a libraries from git store X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=66460b797edb5dea3a8cdfa9c5945e9175f800f7;p=mirrors%2FFD230.git fix compile error in linux , remove some .a libraries from git store --- diff --git a/code/sdk/.gitignore b/code/sdk/.gitignore index 2936baf2c..4c0821c60 100644 --- a/code/sdk/.gitignore +++ b/code/sdk/.gitignore @@ -1,3 +1,11 @@ .deveco/** .vscode/** - +interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a +interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a +interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a +interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a +interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a +interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a +interim_binary/brandy/libs/gpu/evb_standard/libgpu.a +interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a +interim_binary/brandy/libs/media/evb_standard/libjs_player.a diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp index ec6711fc9..93533b9c9 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp @@ -1,7 +1,7 @@ #include "AppViewIDs.h" #include "NativeAbility.h" -#include "/blood/include/BloodCheckPresenter.h" +#include "blood/include/BloodCheckPresenter.h" namespace OHOS { @@ -73,4 +73,4 @@ namespace OHOS return true; } -} \ No newline at end of file +} diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckView.cpp index 70c6c9571..5b7906928 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckView.cpp @@ -1,6 +1,6 @@ -#include "/blood/include/BloodCheckView.h" +#include "blood/include/BloodCheckView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodErrorPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodErrorPresenter.cpp index 744a59d68..db866cd15 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodErrorPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodErrorPresenter.cpp @@ -1,7 +1,7 @@ #include "AppViewIDs.h" #include "NativeAbility.h" -#include "/blood/include/BloodErrorPresenter.h" +#include "blood/include/BloodErrorPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodErrorView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodErrorView.cpp index 4bfba9226..9c3972355 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodErrorView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodErrorView.cpp @@ -1,6 +1,6 @@ -#include "/blood/include/BloodErrorView.h" +#include "blood/include/BloodErrorView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodNotePresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodNotePresenter.cpp index 870bfc79e..66c17e2c7 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodNotePresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodNotePresenter.cpp @@ -1,7 +1,7 @@ #include "AppViewIDs.h" #include "NativeAbility.h" -#include "/blood/include/BloodNotePresenter.h" +#include "blood/include/BloodNotePresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodNoteView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodNoteView.cpp index 4aa2db730..e4c023fd6 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodNoteView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodNoteView.cpp @@ -1,6 +1,6 @@ -#include "/blood/include/BloodNoteView.h" +#include "blood/include/BloodNoteView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp index 0ed4c65c0..8d8ff3c0f 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodPresenter.cpp @@ -1,7 +1,7 @@ #include "AppViewIDs.h" #include "NativeAbility.h" -#include "/blood/include/BloodPresenter.h" +#include "blood/include/BloodPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodShowPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodShowPresenter.cpp index 3ed16060e..80a51146b 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodShowPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodShowPresenter.cpp @@ -1,7 +1,7 @@ #include "AppViewIDs.h" #include "NativeAbility.h" -#include "/blood/include/BloodShowPresenter.h" +#include "blood/include/BloodShowPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodShowView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodShowView.cpp index 9d5d04981..05f68c9dc 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodShowView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodShowView.cpp @@ -1,6 +1,6 @@ -#include "/blood/include/BloodShowView.h" +#include "blood/include/BloodShowView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp index f002dc82b..577b521db 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp @@ -1,6 +1,6 @@ -#include "/blood/include/BloodView.h" +#include "blood/include/BloodView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRateView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRateView.cpp index 4f44d17b8..2bf4eef2f 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRateView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRateView.cpp @@ -21,7 +21,7 @@ #include #include #include "MainViewSample.h" -#include "/heartrate/include/HeartRemindPresenter.h" +#include "heartrate/include/HeartRemindPresenter.h" namespace OHOS { static HeartRateView *g_pHeartRateView = nullptr; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRemindPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRemindPresenter.cpp index f31621d01..cedda8826 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRemindPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRemindPresenter.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "/heartrate/include/HeartRemindPresenter.h" +#include "heartrate/include/HeartRemindPresenter.h" #include "HeartRateView.h" namespace OHOS @@ -82,4 +82,4 @@ namespace OHOS } return true; } -} \ No newline at end of file +} diff --git a/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRemindView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRemindView.cpp index 21f82bb3c..05fa05b72 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRemindView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/heartrate/src/HeartRemindView.cpp @@ -1,6 +1,6 @@ /*正常的心率范围:60~100*/ -#include "/heartrate/include/HeartRemindView.h" +#include "heartrate/include/HeartRemindView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a deleted file mode 100644 index 4c413c14f..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a and /dev/null differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a deleted file mode 100644 index 898e17a7b..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a and /dev/null differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a deleted file mode 100644 index ea9ea001a..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a and /dev/null differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a deleted file mode 100644 index 89a82787b..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a and /dev/null differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a deleted file mode 100644 index 57004295b..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a and /dev/null differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a deleted file mode 100644 index 81a2a7169..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a and /dev/null differ diff --git a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a deleted file mode 100644 index aec97b3ca..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a and /dev/null differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a deleted file mode 100644 index 80bb42c05..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a and /dev/null differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a deleted file mode 100644 index dbbb34c9d..000000000 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a and /dev/null differ