Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

# Conflicts:
#	app/build.gradle
This commit is contained in:
donghongyu
2022-02-07 19:15:11 +08:00
1020 changed files with 27335 additions and 11036 deletions

View File

@@ -68,10 +68,7 @@ include ':modules:mogo-module-chat'
// 语音
include ':tts:tts-base'
include ':tts:tts-di'
include ':tts:tts-zhi'
include ':tts:tts-pad'
include ':tts:tts-noop'
// 测试DEBUG
include ':test:crashreport'
@@ -79,3 +76,11 @@ include ':test:crashreport'
include ':test:crashreport-noop'
include ':test:crashreport-upgrade'
include ':test:crashreport-apmbyte'
//OCH 业务模块
include ':OCH:mogo-och-bus'
include ':OCH:mogo-och-taxi'
include ':OCH:mogo-och-taxi-passenger'
include ':OCH:mogo-och-noop'