已合并
[Profiling]恢复avp模块编译打包，修复gcc10版本ut用例编译失败问题 #753
zhengkai创建于 3月10日
[Profiling]恢复avp模块编译打包，修复gcc10版本ut用例编译失败问题 #753
已合并
共 3 个文件变更+7-5
| @@ -8,4 +8,7 @@ | |||
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | add_subdirectory(basic) | 10 | add_subdirectory(basic) |
| 11 | -add_subdirectory(dvvp) | 11 | +add_subdirectory(dvvp) |
| 12 | +if ("${PRODUCT}" STREQUAL "ascend035") | ||
| 13 | + add_subdirectory(avp) | ||
| 14 | +endif() | ||
| @@ -42,8 +42,8 @@ set(basicInc | |||
| 42 | ) | 42 | ) |
| 43 | 43 | ||
| 44 | set(libcSecSrc | 44 | set(libcSecSrc |
| 45 | - ${RUNTIME_DIR}/third_party/libc_sec/src/memset_s.c | 45 | + ${RUNTIME_DIR}/../abl/libc_sec/src/memset_s.c |
| 46 | - ${RUNTIME_DIR}/third_party/libc_sec/src/strcat_s.c | 46 | + ${RUNTIME_DIR}/../abl/libc_sec/src/strcat_s.c |
| 47 | ) | 47 | ) |
| 48 | 48 | ||
| 49 | set(domainSrc | 49 | set(domainSrc |
| @@ -106,8 +106,6 @@ add_library(profcore_static STATIC | |||
| 106 | target_include_directories(profcore_static PRIVATE | 106 | target_include_directories(profcore_static PRIVATE |
| 107 | ${LIBC_SEC_HEADER} | 107 | ${LIBC_SEC_HEADER} |
| 108 | ${RUNTIME_DIR}/include/driver | 108 | ${RUNTIME_DIR}/include/driver |
| 109 | - ${RUNTIME_DIR}/tests/ut/msprof/ut/common/stub | ||
| 110 | - ${RUNTIME_DIR}/tests/ut/msprof/ut/avp/stub | ||
| 111 | ${basicInc} | 109 | ${basicInc} |
| 112 | ${domainInc} | 110 | ${domainInc} |
| 113 | ${serviceInc} | 111 | ${serviceInc} |
| @@ -8,6 +8,7 @@ | |||
| 8 | * See LICENSE in the root of the software repository for the full text of the License. | 8 | * See LICENSE in the root of the software repository for the full text of the License. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | + | ||
| 11 | 12 | ||
| 12 | 13 | ||
| 13 | 14 | ||