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

Commit 80d5c425 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am fb37c97c: am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 

* commit 'fb37c97c':
  Fix tests for Java 6.
parents 9837c51a fb37c97c

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