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

Commit 5d26963f authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

Merge "More layoutlib testing infra fixes"

parents 5731460c c318f0b4

tools/layoutlib/.gitignore

+1 −0
Original line number Diff line number Diff line 
bin

/.idea/workspace.xml

/out

/bridge/out

tools/layoutlib/bridge/bridge.iml

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" />

      <sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />

      <sourceFolder url="file://$MODULE_DIR$/tests/res/testApp/MyApplication/src/main/myapplication.widgets" isTestSource="true" />

      <excludeFolder url="file://$MODULE_DIR$/.settings" />

      <excludeFolder url="file://$MODULE_DIR$/bin" />

      <excludeFolder url="file://$MODULE_DIR$/tests/res/testApp/MyApplication/.gradle" />

tools/layoutlib/bridge/tests/res/empty.xml

0 → 100644
+0 −0

Empty file added.

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

+6 −3
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ allprojects { 
apply plugin: 'com.android.application'



android {

    compileSdkVersion 22

    buildToolsVersion '21.1.2'

    compileSdkVersion 25

    buildToolsVersion '25.0.0'

    defaultConfig {

        applicationId 'com.android.layoutlib.test.myapplication'

        minSdkVersion 21

        targetSdkVersion 22

        targetSdkVersion 25

        versionCode 1

        versionName '1.0'

    }
@@ -34,6 +34,9 @@ android { 
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }

    }

    lintOptions {

        abortOnError false

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_6

        targetCompatibility JavaVersion.VERSION_1_6

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

+32 B (2.29 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file