am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev (5bc625d8) · Commits · e / os / android_frameworks_base

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

+5 −7

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ buildscript {
		jcenter()
		}
		dependencies {
		classpath 'com.android.tools.build:gradle:0.12.+'
		classpath 'com.android.tools.build:gradle:1.1.3'

		// NOTE: Do not place your application dependencies here; they belong
		// in the individual module build.gradle files
		@@ -19,23 +19,21 @@ allprojects {
		apply plugin: 'com.android.application'

		android {
		compileSdkVersion 20
		buildToolsVersion '20'
		compileSdkVersion 21
		buildToolsVersion '21.1.2'
		defaultConfig {
		applicationId 'com.android.layoutlib.test.myapplication'
		minSdkVersion 19
		targetSdkVersion 20
		targetSdkVersion 21
		versionCode 1
		versionName '1.0'
		}
		buildTypes {
		release {
		runProguard false
		minifyEnabled false
		proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
		}
		}
		productFlavors {
		}
		}

		dependencies {