Merge branch 'WJC' into MergeFL

wxr

2021-07-05 e0cea373fd5cda37421407a41453286469ac1145

1
2
${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/cerficate_v2
${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TuyaSmartUtil.bundle