Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec8df9af authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Fix tests for Java 6. 

 - Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
parent b0197033

tools/layoutlib/.idea/libraries/guava.xml

+2 −2
Original line number Diff line number Diff line 
<component name="libraryTable">

  <library name="guava">

    <CLASSES>

      <root url="jar://$PROJECT_DIR$/../../../../out/host/common/obj/JAVA_LIBRARIES/guavalib_intermediates/javalib.jar!/" />

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/15.0/guava-15.0.jar!/" />

    </CLASSES>

    <JAVADOC />

    <SOURCES>

      <root url="file://$PROJECT_DIR$/../../../../external/guava/guava/src" />

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/15.0/guava-15.0-sources.jar!/" />

    </SOURCES>

  </library>

</component>
 
 No newline at end of file

tools/layoutlib/.idea/runConfigurations/All_in_bridge.xml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
  <configuration default="false" name="All in bridge" type="JUnit" factoryName="JUnit" singleton="true">

    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />

    <module name="bridge" />

    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />

    <option name="ALTERNATIVE_JRE_PATH" value="1.7" />

    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />

    <option name="ALTERNATIVE_JRE_PATH" value="" />

    <option name="PACKAGE_NAME" value="" />

    <option name="MAIN_CLASS_NAME" value="" />

    <option name="METHOD_NAME" value="" />

tools/layoutlib/bridge/tests/res/testApp/MyApplication/build.gradle

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ android { 
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_6

        targetCompatibility JavaVersion.VERSION_1_6

    }

}



dependencies {

tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/androidTest/debug/com/android/layoutlib/test/myapplication/test/BuildConfig.class

0 → 100644
+792 B

File added.

No diff preview for this file type.

View file

tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/BuildConfig.class

(777 B)

File changed.

No diff preview for this file type.

View original file
View changed file