commit 0047f542b58f1724d5263f9b21301eddabfa0ad2
author Tor Norbye <tnorbye@google.com> Tue Jun 02 14:48:05 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 02 14:48:05 2015 +0000
tree c296afe3b7c096c40434ce20585ddb5b671b2864
parent 72bad6bf9129eb137f4948b449fecc44f24ee6ae
parent 5965b3c0da71b31923572f7fffa8fb79f8fd7929

Merge "Don't use layoutlib preview versions unless building with preview platform. DO NOT MERGE" into studio-1.2-release

android/src/com/android/tools/idea/configurations/ConfigurationManager.java

diff --git a/android/src/com/android/tools/idea/configurations/ConfigurationManager.java b/android/src/com/android/tools/idea/configurations/ConfigurationManager.java
index e63c7cb..b9884a3 100755
--- a/android/src/com/android/tools/idea/configurations/ConfigurationManager.java
+++ b/android/src/com/android/tools/idea/configurations/ConfigurationManager.java
@@ -18,6 +18,7 @@
 import com.android.annotations.VisibleForTesting;
 import com.android.ide.common.resources.configuration.FolderConfiguration;
 import com.android.ide.common.resources.configuration.LocaleQualifier;
+import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.devices.Device;
 import com.android.sdklib.devices.DeviceManager;
@@ -273,6 +274,13 @@
     for (int i = targetList.length - 1; i >= 0; i--) {
       IAndroidTarget target = targetList[i];
       if (isLayoutLibTarget(target)) {
+        if (target.getVersion().isPreview()) {
+          // Only pick this target if the project is also compiled with the same target
+          AndroidVersion buildSdkVersion = AndroidModuleInfo.getBuildSdkVersion(myModule);
+          if (buildSdkVersion != null && !buildSdkVersion.isPreview()) {
+            continue;
+          }
+        }
         return target;
       }
     }
@@ -512,7 +520,15 @@
     IAndroidTarget[] targetList = getTargets();
     for (int i = targetList.length - 1; i >= 0; i--) {
       target = targetList[i];
-      if (isLayoutLibTarget(target) && target.getVersion().getApiLevel() >= min) {
+      if (isLayoutLibTarget(target) && target.getVersion().getFeatureLevel() >= min) {
+        if (target.getVersion().isPreview()) {
+          // Only pick this target if the project is also compiled with the same target
+          AndroidVersion buildSdkVersion = AndroidModuleInfo.getBuildSdkVersion(myModule);
+          if (buildSdkVersion != null && !buildSdkVersion.isPreview()) {
+            continue;
+          }
+        }
+
         return target;
       }
     }