Reverse merged revision(s) 988-987 from VisitFace/RtspNativeCodec: JsonCpp和...

chenke

2017-08-09 a0092014ee12abf06edb1788b189cc7c57336063

 VisitFace/RtspNativeCodec/app/app.iml

@@ -8,7 +8,7 @@
    </facet>
    <facet type="native-android-gradle" name="Native-Android-Gradle">
      <configuration>
        <option name="SELECTED_BUILD_VARIANT" value="debug" />
        <option name="SELECTED_BUILD_VARIANT" value="release" />
      </configuration>
    </facet>
    <facet type="android" name="Android">
@@ -39,6 +39,9 @@
    </content>
    <content url="file://$MODULE_DIR$/../../../RtspFace/CvUtil">
      <sourceFolder url="file://$MODULE_DIR$/../../../RtspFace/CvUtil" isTestSource="false" />
    </content>
    <content url="file://$MODULE_DIR$/../../../RtspFace/FFmpegRTSPServer">
      <sourceFolder url="file://$MODULE_DIR$/../../../RtspFace/FFmpegRTSPServer" isTestSource="false" />
    </content>
    <content url="file://$MODULE_DIR$/../../../RtspFace/Logger/src">
      <sourceFolder url="file://$MODULE_DIR$/../../../RtspFace/Logger/src" isTestSource="false" />
@@ -102,21 +105,16 @@
      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>